From e81d9dc3e8a16f9c736d036cce76740fb7b51e91 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 27 May 2008 02:15:42 +0000 Subject: [PATCH] 2008-05-27 04:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * make_vc.mak - No longer explicily defining WIN32, __WIN32__, __WINDOWS__ macros. --- harbour/ChangeLog | 9 +++++++-- harbour/make_vc.mak | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c137e1455e..e14d8ac3b0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-27 04:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * make_vc.mak + - No longer explicily defining WIN32, __WIN32__, __WINDOWS__ + macros. + 2008-05-27 04:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbwhat32/_windlg.c * contrib/hbole/ole2.c @@ -18,12 +23,12 @@ * contrib/gtwvg/wvtutils.c * contrib/hbfimage/fi_winfu.c * contrib/hbfimage/fi_wrp.c - ! MSVC error and warnings fixes. + ! MSVC errors and warnings fixed. ; TOFIX: Several of them remain. Some contribs don't compile (gtwvg, hbole, hbw32) at all in C++ mode. * contrib/mtpl_vc.mak - - Removed explicily defining WIN32, __WIN32__, __WINDOWS__ + - No longer explicily defining WIN32, __WIN32__, __WINDOWS__ macros. 2008-05-27 03:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu) diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 9294c72506..fe7da9823b 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -124,8 +124,7 @@ CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX -FD -Gs !endif CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -T$(HB_BUILD_MODE) \ - -W3 -nologo -D__WINDOWS__ -DWIN32 -D__WIN32__ \ - $(C_USR) $(CFLAGS) -I$(OBJ_DIR) + -W3 -nologo $(C_USR) $(CFLAGS) -I$(OBJ_DIR) #----------- !if "$(HB_BUILD_DEBUG)" == "yes" CFLAGS = -Zi $(CFLAGS)