From 5348f0c1d47c743831563aeebf01e87c2c102244 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 2 Dec 2008 12:46:19 +0000
Subject: [PATCH] 2008-12-02 13:48 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/source/common/hbstr.c   *
 harbour/config/w32/xcc.cf     ! fixed XCC compilation

  * harbour/contrib/gtwvg/wvgwin.c
    ! changed _MAX_PATH to MAX_PATH - not all compilers support _MAX_PATH
---
 harbour/ChangeLog              | 8 ++++++++
 harbour/config/w32/xcc.cf      | 6 +++++-
 harbour/contrib/gtwvg/wvgwin.c | 2 +-
 harbour/source/common/hbstr.c  | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 45987e7834..b47a445493 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-12-02 13:48 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/common/hbstr.c
+  * harbour/config/w32/xcc.cf
+    ! fixed XCC compilation
+
+  * harbour/contrib/gtwvg/wvgwin.c
+    ! changed _MAX_PATH to MAX_PATH - not all compilers support _MAX_PATH
+
 2008-12-02 11:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/xhb/Makefile
   * harbour/contrib/xhb/common.mak
diff --git a/harbour/config/w32/xcc.cf b/harbour/config/w32/xcc.cf
index ce7574cb99..8a1874f4f4 100644
--- a/harbour/config/w32/xcc.cf
+++ b/harbour/config/w32/xcc.cf
@@ -14,7 +14,11 @@ LIB_EXT = .lib
 CC = xcc.exe
 CC_IN = -c
 CC_OUT = -Fo
-CPPFLAGS = -I$(HB_INC_COMPILE) -I$(TOP) -I$(TOP)$(ROOT)
+CPPFLAGS = -I$(TOP) -I$(ROOT) -I$(TOP)$(ROOT)
+ifneq ($(HB_INC_COMPILE),)
+CPPFLAGS += -I$(HB_INC_COMPILE)
+endif
+
 # disabled - it produces bad code
 #CPPFLAGS += -Ot
 
diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c
index 0121959bb5..b4873b26af 100644
--- a/harbour/contrib/gtwvg/wvgwin.c
+++ b/harbour/contrib/gtwvg/wvgwin.c
@@ -1104,7 +1104,7 @@ static HBITMAP hPrepareBitmap( char * szBitmapX, UINT uiBitmap,
    else  /* loading from resources */
    {
       UINT uiOptions = bMap3Dcolors ? LR_LOADMAP3DCOLORS : LR_DEFAULTCOLOR;
-      char szResname[ _MAX_PATH+1 ];
+      char szResname[ MAX_PATH + 1 ];
 
       sprintf( szResname, "?%u", uiBitmap );
 
diff --git a/harbour/source/common/hbstr.c b/harbour/source/common/hbstr.c
index f76e75b61e..d6ca79d538 100644
--- a/harbour/source/common/hbstr.c
+++ b/harbour/source/common/hbstr.c
@@ -1117,7 +1117,7 @@ ULONG hb_snprintf( char * buffer, ULONG nSize, const char * format, ... )
    result = vsprintf( buffer, format, arglist );
 #elif defined( _MSC_VER ) && _MSC_VER >= 1400
    result = _vsnprintf_s( buffer, nSize, _TRUNCATE, format, arglist );
-#elif defined( _MSC_VER ) || defined( __DMC__ ) && !defined( __XCC__ )
+#elif ( defined( _MSC_VER ) || defined( __DMC__ ) ) && !defined( __XCC__ )
    result = _vsnprintf( buffer, nSize, format, arglist );
    #define _HB_SNPRINTF_ADD_EOS
 #elif defined( __WATCOMC__ ) && __WATCOMC__ < 1200