From f7e81a1402ee7ce4e4adb51146f169c2726d65f3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 30 May 2008 10:18:29 +0000 Subject: [PATCH] 2008-05-30 12:17 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbdefs.h - Removed WIN32_LEAN_AND_MEAN to make things more standard. We're losing some compile time performance for Windows build, but it's marginal. Runtime performance is not affected. * contrib/hbgd/gdwrp.c * Removed BCC55 hack to workaround WIN32_LEAN_AND_MEAN problem. --- harbour/ChangeLog | 10 ++++++++++ harbour/contrib/hbgd/gdwrp.c | 8 -------- harbour/include/hbdefs.h | 1 - 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c2d4fc3609..1df8d4633e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-30 12:17 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * include/hbdefs.h + - Removed WIN32_LEAN_AND_MEAN to make things more standard. + We're losing some compile time performance for Windows build, + but it's marginal. Runtime performance is not affected. + + * contrib/hbgd/gdwrp.c + * Removed BCC55 hack to workaround WIN32_LEAN_AND_MEAN + problem. + 2008-05-30 12:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbsetup.ch * include/hbsetup.h diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c index 579e347925..b32a64328e 100644 --- a/harbour/contrib/hbgd/gdwrp.c +++ b/harbour/contrib/hbgd/gdwrp.c @@ -58,14 +58,6 @@ #include "hbapierr.h" #include "hbapifs.h" -/* NOTE: We need this to generate proper extern references for BCC 5.5 - (even 5.8 don't need this hack). Harbour uses WIN32_LEAN_AND_MEAN, - which makes BCC 5.5 leave out something which causes wrong - extern references. So we need full windows.h and we're including it. */ -#ifdef HB_OS_WIN_32 - #include -#endif - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 7988676fd7..49cefe83a3 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -97,7 +97,6 @@ /* Include windows.h if applicable and requested */ #if defined( HB_OS_WIN_32_USED ) && defined( HB_OS_WIN_32 ) - #define WIN32_LEAN_AND_MEAN #include #if defined( __GNUC__ ) #define HB_DONT_DEFINE_BASIC_TYPES