From f9a58a4debcd6b24c91c6b76a82eda7814926d7d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 8 Jan 2011 12:53:19 +0000
Subject: [PATCH] 2011-01-08 13:52 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * src/3rd/png/pnglconf.h     ! Fix for watcom compilers. Patch
 by Tamas.

  * contrib/hbmxml/hbmxmlp.prg
    % Optimized out local variables.

  * ChangeLog
    ! Fixed missing credit for Tamas in 2011-01-07 18:30 UTC+0200 Petr Chornyj
---
 harbour/ChangeLog                  | 11 +++++++++++
 harbour/contrib/hbmxml/hbmxmlp.prg | 21 +++------------------
 harbour/src/3rd/png/pnglconf.h     |  6 +++++-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b61b82e704..7b3e4da1e6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-08 13:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/3rd/png/pnglconf.h
+    ! Fix for watcom compilers. Patch by Tamas.
+
+  * contrib/hbmxml/hbmxmlp.prg
+    % Optimized out local variables.
+
+  * ChangeLog
+    ! Fixed missing credit for Tamas in 2011-01-07 18:30 UTC+0200 Petr Chornyj
+
 2011-01-08 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbmisc/nconvert.prg
     * Removed unnecessary parantheses.
@@ -245,6 +255,7 @@
   * contrib/hbmxml/hbmxml.hbp
   + hbmxml/hbmxmlp.prg
     Added mxmlSetTextf()/mxmlNetTextf()/mxmlElementSetAttrf
+    Code by Tamas Tevesz.
 
 2011-01-07 15:30 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
   * contrib/hbmxml/hbmxml.c
diff --git a/harbour/contrib/hbmxml/hbmxmlp.prg b/harbour/contrib/hbmxml/hbmxmlp.prg
index e9385afdea..9f03de1a8e 100644
--- a/harbour/contrib/hbmxml/hbmxmlp.prg
+++ b/harbour/contrib/hbmxml/hbmxmlp.prg
@@ -59,12 +59,7 @@
  *                           ... )
  */
 FUNCTION mxmlElementSetAttrf( hNode, cName, cFormat, ... )
-
-   LOCAL cValue
-
-   cValue := hb_strFormat( cFormat, ... )
-
-   RETURN mxmlElementSetAttr( hNode, cName, cValue )
+   RETURN mxmlElementSetAttr( hNode, cName, hb_strFormat( cFormat, ... ) )
 
 /*
  * void mxmlNewTextf( mxml_node_t * node,
@@ -73,12 +68,7 @@ FUNCTION mxmlElementSetAttrf( hNode, cName, cFormat, ... )
  *                    ... )
  */
 FUNCTION mxmlNewTextf( hNode, nWhitespace, cFormat, ... )
-
-   LOCAL cText
-
-   cText := hb_strFormat( cFormat, ... )
-
-   RETURN mxmlNewText( hNode, nWhitespace, cText )
+   RETURN mxmlNewText( hNode, nWhitespace, hb_strFormat( cFormat, ... ) )
 
 /*
  * int mxmlSetTextf( mxml_node_t * node,
@@ -87,9 +77,4 @@ FUNCTION mxmlNewTextf( hNode, nWhitespace, cFormat, ... )
  *                   ... )
  */
 FUNCTION mxmlSetTextf( hNode, nWhitespace, cFormat, ... )
-
-   LOCAL cText
-
-   cText := hb_strFormat( cFormat, ... )
-
-   RETURN mxmlSetText( hNode, nWhitespace, cText )
+   RETURN mxmlSetText( hNode, nWhitespace, hb_strFormat( cFormat, ... ) )
diff --git a/harbour/src/3rd/png/pnglconf.h b/harbour/src/3rd/png/pnglconf.h
index 8d00453b19..3097d58aec 100644
--- a/harbour/src/3rd/png/pnglconf.h
+++ b/harbour/src/3rd/png/pnglconf.h
@@ -22,7 +22,11 @@
 #define PNG_QUANTIZE_RED_BITS 5
 #define PNG_USER_WIDTH_MAX 1000000L
 #define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_API_RULE 0
+#if defined( __WATCOMC__ )
+#  define PNG_API_RULE 2
+#else
+#  define PNG_API_RULE 0
+#endif
 #define PNG_QUANTIZE_BLUE_BITS 5
 #define PNG_USER_CHUNK_CACHE_MAX 0
 #define PNG_USER_HEIGHT_MAX 1000000L