From 8f382cc44595bb7a42e64d66b61acc241ddb11f9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 20 Feb 2009 09:33:44 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 58 +++++++++++++++++++++++++++++-- harbour/contrib/hbwhat/whtbmp.c | 1 + harbour/contrib/hbwhat/whtbrsh.c | 1 + harbour/contrib/hbwhat/whtcdlg.c | 1 + harbour/contrib/hbwhat/whtclpb.c | 1 + harbour/contrib/hbwhat/whtcomm.c | 2 ++ harbour/contrib/hbwhat/whtcret.c | 1 + harbour/contrib/hbwhat/whtdate.c | 1 + harbour/contrib/hbwhat/whtdc.c | 1 + harbour/contrib/hbwhat/whtdir.c | 1 + harbour/contrib/hbwhat/whtdlg.c | 1 + harbour/contrib/hbwhat/whtdraw.c | 1 + harbour/contrib/hbwhat/whtfont.c | 1 + harbour/contrib/hbwhat/whtgdi.c | 1 + harbour/contrib/hbwhat/whthead.c | 2 ++ harbour/contrib/hbwhat/whticon.c | 1 + harbour/contrib/hbwhat/whtilst.c | 2 ++ harbour/contrib/hbwhat/whtinet.c | 2 ++ harbour/contrib/hbwhat/whtini.c | 1 + harbour/contrib/hbwhat/whtkbrd.c | 1 + harbour/contrib/hbwhat/whtlv.c | 1 + harbour/contrib/hbwhat/whtmem.c | 1 + harbour/contrib/hbwhat/whtmenu.c | 1 + harbour/contrib/hbwhat/whtmeta.c | 1 + harbour/contrib/hbwhat/whtmisc.c | 1 + harbour/contrib/hbwhat/whtmmcap.c | 1 + harbour/contrib/hbwhat/whtmous.c | 1 + harbour/contrib/hbwhat/whtmsg.c | 1 + harbour/contrib/hbwhat/whtpen.c | 1 + harbour/contrib/hbwhat/whtprn.c | 1 + harbour/contrib/hbwhat/whtrect.c | 1 + harbour/contrib/hbwhat/whtreg.c | 1 + harbour/contrib/hbwhat/whtrgn.c | 1 + harbour/contrib/hbwhat/whtscrlb.c | 1 + harbour/contrib/hbwhat/whtseria.c | 1 + harbour/contrib/hbwhat/whtshell.c | 1 + harbour/contrib/hbwhat/whtsock.c | 1 + harbour/contrib/hbwhat/whtsys.c | 1 + harbour/contrib/hbwhat/whttab.c | 2 ++ harbour/contrib/hbwhat/whttbar.c | 1 + harbour/contrib/hbwhat/whttext.c | 1 + harbour/contrib/hbwhat/whtview.c | 1 + harbour/contrib/hbwhat/wincorec.c | 1 + harbour/contrib/hbwin/win_dll.c | 4 +-- harbour/utils/hbmk2/hbmk2.prg | 7 ++-- 45 files changed, 108 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6185b0847b..5ef56ec17c 100644 --- 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 diff --git a/harbour/contrib/hbwhat/whtbmp.c b/harbour/contrib/hbwhat/whtbmp.c index 3a927f5d05..158e5bf882 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtbrsh.c b/harbour/contrib/hbwhat/whtbrsh.c index cfa0b86e08..8ec8591a0e 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtcdlg.c b/harbour/contrib/hbwhat/whtcdlg.c index 0d28b88b25..2d700a03bf 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtclpb.c b/harbour/contrib/hbwhat/whtclpb.c index c94b5c40ba..65cd80b894 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtcomm.c b/harbour/contrib/hbwhat/whtcomm.c index 7df61f8d14..d6c42a8864 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtcret.c b/harbour/contrib/hbwhat/whtcret.c index 2c1e8a1329..dfdeea8cbd 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtdate.c b/harbour/contrib/hbwhat/whtdate.c index 772f40ee1e..f3c12e6ce9 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtdc.c b/harbour/contrib/hbwhat/whtdc.c index 4f97e5884c..7fce262deb 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtdir.c b/harbour/contrib/hbwhat/whtdir.c index ef440451b6..a6f2cb188a 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtdlg.c b/harbour/contrib/hbwhat/whtdlg.c index b77003d109..5c5540b545 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtdraw.c b/harbour/contrib/hbwhat/whtdraw.c index 22575e815a..da854eefd4 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtfont.c b/harbour/contrib/hbwhat/whtfont.c index 5cb9970167..2e04aa762b 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtgdi.c b/harbour/contrib/hbwhat/whtgdi.c index 9c59fad8fc..3483f31988 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whthead.c b/harbour/contrib/hbwhat/whthead.c index a00969990f..03e47bdbbc 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whticon.c b/harbour/contrib/hbwhat/whticon.c index 776fefaf5e..0cefa0397c 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtilst.c b/harbour/contrib/hbwhat/whtilst.c index 83180e6d1e..2f8c884b84 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtinet.c b/harbour/contrib/hbwhat/whtinet.c index 45398aefb5..630a480752 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtini.c b/harbour/contrib/hbwhat/whtini.c index 697a840f0d..afbf2d4ff0 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtkbrd.c b/harbour/contrib/hbwhat/whtkbrd.c index eac7d69931..d0224c4be4 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtlv.c b/harbour/contrib/hbwhat/whtlv.c index 3f31bb7586..e2c73314f9 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtmem.c b/harbour/contrib/hbwhat/whtmem.c index 80594d3137..763c1ce182 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtmenu.c b/harbour/contrib/hbwhat/whtmenu.c index 3fbc0b3abc..ff2f09e54f 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtmeta.c b/harbour/contrib/hbwhat/whtmeta.c index 48506d1703..0d5ac42935 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtmisc.c b/harbour/contrib/hbwhat/whtmisc.c index c0e79457af..01db0a9f4d 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtmmcap.c b/harbour/contrib/hbwhat/whtmmcap.c index fe623ee5f5..c3cdb04038 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtmous.c b/harbour/contrib/hbwhat/whtmous.c index 39f47d21d6..5367e414b2 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtmsg.c b/harbour/contrib/hbwhat/whtmsg.c index b925addc49..2e10ac3066 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtpen.c b/harbour/contrib/hbwhat/whtpen.c index bce83d3267..40c8158a98 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtprn.c b/harbour/contrib/hbwhat/whtprn.c index 6cba919292..724bae071a 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtrect.c b/harbour/contrib/hbwhat/whtrect.c index 0366ec7bff..7f4c0e9d78 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtreg.c b/harbour/contrib/hbwhat/whtreg.c index 497f2e7e27..f0a03ebb44 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtrgn.c b/harbour/contrib/hbwhat/whtrgn.c index 36e952d618..7576114337 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtscrlb.c b/harbour/contrib/hbwhat/whtscrlb.c index 46eb3a77bd..5ad795593d 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtseria.c b/harbour/contrib/hbwhat/whtseria.c index 02e1e771b6..d625534ba2 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtshell.c b/harbour/contrib/hbwhat/whtshell.c index 0dfba2be1e..020e4dacf6 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtsock.c b/harbour/contrib/hbwhat/whtsock.c index 1c5845e4c7..3e0eace34f 100644 --- 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 diff --git a/harbour/contrib/hbwhat/whtsys.c b/harbour/contrib/hbwhat/whtsys.c index e9f89eeb08..7e10f80e21 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whttab.c b/harbour/contrib/hbwhat/whttab.c index 9a1a62d550..833e9db7c0 100644 --- 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__ diff --git a/harbour/contrib/hbwhat/whttbar.c b/harbour/contrib/hbwhat/whttbar.c index 7f387878b2..a70c1ea20a 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whttext.c b/harbour/contrib/hbwhat/whttext.c index dd13f55297..50227933b0 100644 --- 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" diff --git a/harbour/contrib/hbwhat/whtview.c b/harbour/contrib/hbwhat/whtview.c index 152ad22787..3570070a32 100644 --- 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" diff --git a/harbour/contrib/hbwhat/wincorec.c b/harbour/contrib/hbwhat/wincorec.c index 4e80b6152b..076b335e7c 100644 --- 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" diff --git a/harbour/contrib/hbwin/win_dll.c b/harbour/contrib/hbwin/win_dll.c index 31e0cc2e50..1682d05492 100644 --- 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" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 185f5d3c87..f20094461c 100644 --- 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"