2009-02-20 10:32 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* utils/hbmk2/hbmk2.prg ! Fixed build compiler detection when GNU C++ was used on Linux. * contrib/hbwin/win_dll.c % Removed unncessary (potential build-breaker) #define _WIN32_WINNT. * contrib/hbwhat/whtdate.c * contrib/hbwhat/whtini.c * contrib/hbwhat/wincorec.c * contrib/hbwhat/whticon.c * contrib/hbwhat/whtcret.c * contrib/hbwhat/whtsock.c * contrib/hbwhat/whthead.c * contrib/hbwhat/whtseria.c * contrib/hbwhat/whtilst.c * contrib/hbwhat/whtreg.c * contrib/hbwhat/whtmem.c * contrib/hbwhat/whtclpb.c * contrib/hbwhat/whtmous.c * contrib/hbwhat/whtrgn.c * contrib/hbwhat/whtmeta.c * contrib/hbwhat/whttbar.c * contrib/hbwhat/whtrect.c * contrib/hbwhat/whtbrsh.c * contrib/hbwhat/whtgdi.c * contrib/hbwhat/whtscrlb.c * contrib/hbwhat/whtdlg.c * contrib/hbwhat/whtview.c * contrib/hbwhat/whtsys.c * contrib/hbwhat/whtlv.c * contrib/hbwhat/whtmisc.c * contrib/hbwhat/whtcomm.c * contrib/hbwhat/whtmmcap.c * contrib/hbwhat/whtprn.c * contrib/hbwhat/whtinet.c * contrib/hbwhat/whttab.c * contrib/hbwhat/whtfont.c * contrib/hbwhat/whtshell.c * contrib/hbwhat/whtcdlg.c * contrib/hbwhat/whtbmp.c * contrib/hbwhat/whtdir.c * contrib/hbwhat/whtpen.c * contrib/hbwhat/whtkbrd.c * contrib/hbwhat/whttext.c * contrib/hbwhat/whtmsg.c * contrib/hbwhat/whtdc.c * contrib/hbwhat/whtdraw.c * contrib/hbwhat/whtmenu.c ! Added #undef _WIN32_* where needed. This should fix compilation problems if these macros were already #defined by user. It's better however to honor the host setting. This fixed a pending TOFIX.
2009-02-20 09:33:44 +00:00
parent 4c3a2582cd
commit 8f382cc445
45 changed files with 108 additions and 8 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,60 @@
   2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */

+2009-02-20 10:32 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed build compiler detection when GNU C++ was used on Linux.
+
+  * contrib/hbwin/win_dll.c
+    % Removed unncessary (potential build-breaker) #define _WIN32_WINNT.
+
+  * contrib/hbwhat/whtdate.c
+  * contrib/hbwhat/whtini.c
+  * contrib/hbwhat/wincorec.c
+  * contrib/hbwhat/whticon.c
+  * contrib/hbwhat/whtcret.c
+  * contrib/hbwhat/whtsock.c
+  * contrib/hbwhat/whthead.c
+  * contrib/hbwhat/whtseria.c
+  * contrib/hbwhat/whtilst.c
+  * contrib/hbwhat/whtreg.c
+  * contrib/hbwhat/whtmem.c
+  * contrib/hbwhat/whtclpb.c
+  * contrib/hbwhat/whtmous.c
+  * contrib/hbwhat/whtrgn.c
+  * contrib/hbwhat/whtmeta.c
+  * contrib/hbwhat/whttbar.c
+  * contrib/hbwhat/whtrect.c
+  * contrib/hbwhat/whtbrsh.c
+  * contrib/hbwhat/whtgdi.c
+  * contrib/hbwhat/whtscrlb.c
+  * contrib/hbwhat/whtdlg.c
+  * contrib/hbwhat/whtview.c
+  * contrib/hbwhat/whtsys.c
+  * contrib/hbwhat/whtlv.c
+  * contrib/hbwhat/whtmisc.c
+  * contrib/hbwhat/whtcomm.c
+  * contrib/hbwhat/whtmmcap.c
+  * contrib/hbwhat/whtprn.c
+  * contrib/hbwhat/whtinet.c
+  * contrib/hbwhat/whttab.c
+  * contrib/hbwhat/whtfont.c
+  * contrib/hbwhat/whtshell.c
+  * contrib/hbwhat/whtcdlg.c
+  * contrib/hbwhat/whtbmp.c
+  * contrib/hbwhat/whtdir.c
+  * contrib/hbwhat/whtpen.c
+  * contrib/hbwhat/whtkbrd.c
+  * contrib/hbwhat/whttext.c
+  * contrib/hbwhat/whtmsg.c
+  * contrib/hbwhat/whtdc.c
+  * contrib/hbwhat/whtdraw.c
+  * contrib/hbwhat/whtmenu.c
+    ! Added #undef _WIN32_* where needed. This should fix compilation
+      problems if these macros were already #defined by user.
+      It's better however to honor the host setting.
+      This fixed a pending TOFIX.
+
 2009-02-20 09:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
  * utils/hbmk2/hbmk2.prg
    + Added support for build level (or system level if that's
@@ -321,7 +375,7 @@
  * make_gnu_os2.cmd
  * make_gnu.bat
    % Removed make -r switches.
-    ; TODO: Do the same in the rest of the scripts.
+    ; TODO: Do the same in the rest of the scripts. [DONE]

 2009-02-18 22:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
  * ChangeLog
@@ -4336,7 +4390,7 @@
  * source/rtl/gtwvt/gtwvt.c
    ! Fixed to #undef _WIN32_WINNT before setting it.
    ; TOFIX: hbwhat has this problem in almost all of its source
-             files.
+             files. [DONE]

  * contrib/examples/uhttpd/modules/bldhrb.bat
  * contrib/examples/uhttpd/modules/showcounter.prg
--- a/harbour/contrib/hbwhat/whtbmp.c
+++ b/harbour/contrib/hbwhat/whtbmp.c
@@ -17,6 +17,7 @@ Modified and non-API functions:
 */

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtbrsh.c
+++ b/harbour/contrib/hbwhat/whtbrsh.c
@@ -13,6 +13,7 @@
 */

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtcdlg.c
+++ b/harbour/contrib/hbwhat/whtcdlg.c
@@ -7,6 +7,7 @@
 // Common dialogs


+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtclpb.c
+++ b/harbour/contrib/hbwhat/whtclpb.c
@@ -14,6 +14,7 @@
 //----------------------------------------------------------------------------//

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtcomm.c
+++ b/harbour/contrib/hbwhat/whtcomm.c
@@ -11,7 +11,9 @@



+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400
+#undef _WIN32_IE
 #define _WIN32_IE      0x0500

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtcret.c
+++ b/harbour/contrib/hbwhat/whtcret.c
@@ -8,6 +8,7 @@
 */

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtdate.c
+++ b/harbour/contrib/hbwhat/whtdate.c
@@ -7,6 +7,7 @@
 // DateTimePicker functions

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtdc.c
+++ b/harbour/contrib/hbwhat/whtdc.c
@@ -9,6 +9,7 @@
 // GetDCOrgEx(hDC) -> aPt or NIL on failure

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtdir.c
+++ b/harbour/contrib/hbwhat/whtdir.c
@@ -8,6 +8,7 @@


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0500

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtdlg.c
+++ b/harbour/contrib/hbwhat/whtdlg.c
@@ -15,6 +15,7 @@


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtdraw.c
+++ b/harbour/contrib/hbwhat/whtdraw.c
@@ -6,6 +6,7 @@
 // Graphics  & Drawing

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtfont.c
+++ b/harbour/contrib/hbwhat/whtfont.c
@@ -10,6 +10,7 @@


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtgdi.c
+++ b/harbour/contrib/hbwhat/whtgdi.c
@@ -16,6 +16,7 @@


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whthead.c
+++ b/harbour/contrib/hbwhat/whthead.c
@@ -6,7 +6,9 @@
 // hbwhat

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400
+#undef _WIN32_IE
 #define _WIN32_IE      0x0500

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whticon.c
+++ b/harbour/contrib/hbwhat/whticon.c
@@ -7,6 +7,7 @@



+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtilst.c
+++ b/harbour/contrib/hbwhat/whtilst.c
@@ -7,7 +7,9 @@
 // ImageList functions

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400
+#undef _WIN32_IE
 #define _WIN32_IE      0x0500

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtinet.c
+++ b/harbour/contrib/hbwhat/whtinet.c
@@ -17,7 +17,9 @@
 //---------------------------------------------------------------------//
 //---------------------------------------------------------------------//

+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400
+#undef _WIN32_IE
 #define _WIN32_IE      0x0500

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtini.c
+++ b/harbour/contrib/hbwhat/whtini.c
@@ -54,6 +54,7 @@
 */

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtkbrd.c
+++ b/harbour/contrib/hbwhat/whtkbrd.c
@@ -18,6 +18,7 @@ Modified functions:


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtlv.c
+++ b/harbour/contrib/hbwhat/whtlv.c
@@ -2,6 +2,7 @@
 * $Id$
 */

+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtmem.c
+++ b/harbour/contrib/hbwhat/whtmem.c
@@ -5,6 +5,7 @@
 // Memory management


+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtmenu.c
+++ b/harbour/contrib/hbwhat/whtmenu.c
@@ -6,6 +6,7 @@
 // Menu functions


+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtmeta.c
+++ b/harbour/contrib/hbwhat/whtmeta.c
@@ -7,6 +7,7 @@
 // Metafile functions

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtmisc.c
+++ b/harbour/contrib/hbwhat/whtmisc.c
@@ -9,6 +9,7 @@
 // AJ Wos


+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtmmcap.c
+++ b/harbour/contrib/hbwhat/whtmmcap.c
@@ -10,6 +10,7 @@
 */

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbapi.h"
--- a/harbour/contrib/hbwhat/whtmous.c
+++ b/harbour/contrib/hbwhat/whtmous.c
@@ -10,6 +10,7 @@


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtmsg.c
+++ b/harbour/contrib/hbwhat/whtmsg.c
@@ -5,6 +5,7 @@
 // Windows message functions


+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtpen.c
+++ b/harbour/contrib/hbwhat/whtpen.c
@@ -8,6 +8,7 @@


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtprn.c
+++ b/harbour/contrib/hbwhat/whtprn.c
@@ -5,6 +5,7 @@
 // hbwhat
 // Printing

+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtrect.c
+++ b/harbour/contrib/hbwhat/whtrect.c
@@ -8,6 +8,7 @@
 // Thanks Luiz

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtreg.c
+++ b/harbour/contrib/hbwhat/whtreg.c
@@ -5,6 +5,7 @@
 // Registry interface

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtrgn.c
+++ b/harbour/contrib/hbwhat/whtrgn.c
@@ -9,6 +9,7 @@


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtscrlb.c
+++ b/harbour/contrib/hbwhat/whtscrlb.c
@@ -5,6 +5,7 @@
 // hbwhat
 // Scrollbar API functions

+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtseria.c
+++ b/harbour/contrib/hbwhat/whtseria.c
@@ -13,6 +13,7 @@
 //-------------------------------------------------------------------//
 //-------------------------------------------------------------------//

+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtshell.c
+++ b/harbour/contrib/hbwhat/whtshell.c
@@ -5,6 +5,7 @@
 // hbwhat
 // Shell API

+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtsock.c
+++ b/harbour/contrib/hbwhat/whtsock.c
@@ -8,6 +8,7 @@
 // Note: functions: SELECT and ACCEPT may collide with Clipper/xHarbour names


+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #define _WINSOCKAPI_  // Prevents inclusion of Winsock.h in Windows.h
--- a/harbour/contrib/hbwhat/whtsys.c
+++ b/harbour/contrib/hbwhat/whtsys.c
@@ -33,6 +33,7 @@

 #define WINVER         0X0400
 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whttab.c
+++ b/harbour/contrib/hbwhat/whttab.c
@@ -2,7 +2,9 @@
 * $Id$
 */

+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400
+#undef _WIN32_IE
 #define _WIN32_IE      0x0400

 #ifndef __WATCOMC__
--- a/harbour/contrib/hbwhat/whttbar.c
+++ b/harbour/contrib/hbwhat/whttbar.c
@@ -7,6 +7,7 @@


 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whttext.c
+++ b/harbour/contrib/hbwhat/whttext.c
@@ -6,6 +6,7 @@
 // Text display functions

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/whtview.c
+++ b/harbour/contrib/hbwhat/whtview.c
@@ -6,6 +6,7 @@
 // ViewPort functions

 #define HB_OS_WIN_USED
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwhat/wincorec.c
+++ b/harbour/contrib/hbwhat/wincorec.c
@@ -15,6 +15,7 @@
 //
 //HARBOUR C FUNCTIONS:

+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0400

 #include "hbwhat.h"
--- a/harbour/contrib/hbwin/win_dll.c
+++ b/harbour/contrib/hbwin/win_dll.c
@@ -54,11 +54,9 @@
 * If you do not wish that, delete this exception notice.
 */

-/* NOTE: I'm not totally familiar with how Xbase++ works.  This functionality
+/* NOTE: I'm not totally familiar with how Xbase++ works. This functionality
         was derived from the context in which the functions are used. [pt] */

-#define _WIN32_WINNT   0x0400 /* QUESTION: Do we need this? */
-
 #define HB_OS_WIN_USED

 #include "hbvm.h"
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1206,7 +1206,7 @@ FUNCTION Main( ... )

            /* Compiling */

-            /* Order is significant. */
+            /* Order is significant */
            cOpt_CompC := StrTran( cOpt_CompC, "{LC}"  , ArrayToList( ArrayJoin( ListCook( s_aPRG, NIL, ".c" ), s_aC ) ) )
            cOpt_CompC := StrTran( cOpt_CompC, "{LO}"  , ArrayToList( ListCook( s_aOBJUSER, cObjPrefix ) ) )
            cOpt_CompC := StrTran( cOpt_CompC, "{LA}"  , ArrayToList( s_aOBJA ) )
@@ -1263,7 +1263,7 @@ FUNCTION Main( ... )

         /* Linking */

-         /* Order is significant. */
+         /* Order is significant */
         cOpt_Link := StrTran( cOpt_Link, "{LO}"  , ArrayToList( ListCook( ArrayJoin( s_aOBJ, s_aOBJUSER ), cObjPrefix ) ) )
         cOpt_Link := StrTran( cOpt_Link, "{LA}"  , ArrayToList( s_aOBJA ) )
         cOpt_Link := StrTran( cOpt_Link, "{LL}"  , ArrayToList( s_aLIB ) )
@@ -1339,12 +1339,13 @@ FUNCTION Main( ... )
 STATIC FUNCTION SelfCOMP()
   LOCAL cCompiler := hb_Compiler()

+   /* Order is significant */
   IF     "Microsoft Visual C" $ cCompiler ; RETURN "msvc"
   ELSEIF "Borland"            $ cCompiler ; RETURN "bcc32"
   ELSEIF "CodeGear"           $ cCompiler ; RETURN "bcc32"
   ELSEIF "DJGPP"              $ cCompiler ; RETURN "djgpp"
   ELSEIF "MinGW"              $ cCompiler ; RETURN "mingw"
-   ELSEIF "GNU C++"            $ cCompiler ; RETURN "gcc"
+   ELSEIF "GNU C++"            $ cCompiler ; RETURN iif( t_cARCH == "linux", "gpp", "gcc" )
   ELSEIF "GNU C"              $ cCompiler ; RETURN "gcc"
   ELSEIF "Watcom C++"         $ cCompiler ; RETURN "owatcom"
   ELSEIF "Watcom C"           $ cCompiler ; RETURN "owatcom"