From 659481f42160fc9df364c78e5bf09bdf15a98647 Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Thu, 21 Oct 1999 05:17:48 +0000 Subject: [PATCH] Changed _Windows to _WINDOWS_ in environ.c --- harbour/ChangeLog | 5 +++++ harbour/source/rtl/environ.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b916859514..a0be626198 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,8 @@ +19991021-00:50 EDT Paul Tucker + * source/rtl/environ.c + changed defined(_Windows) to defined(_WINDOWS_) since this is + what gets created in Windows.h + 19991021-01:48 GMT+1 Victor Szel * include/hbtrace.h ! TRACE() fixed to HB_TRACE() (that was a bit late :) diff --git a/harbour/source/rtl/environ.c b/harbour/source/rtl/environ.c index fff4810ef8..9fde1508ee 100644 --- a/harbour/source/rtl/environ.c +++ b/harbour/source/rtl/environ.c @@ -59,7 +59,7 @@ be ahead of any other #include statements! */ #include "hbwinapi.h" -#if defined(__BORLANDC__) && defined(_Windows) && ! defined(VER_PLATFORM_WIN32_WINDOWS) +#if defined(__BORLANDC__) && defined(_WINDOWS_) && ! defined(VER_PLATFORM_WIN32_WINDOWS) #define VER_PLATFORM_WIN32_WINDOWS 1 #endif @@ -136,7 +136,7 @@ HARBOUR HB_OS( void ) /* TODO: add MSVC support but MSVC cannot detect any OS except Windows! */ #if defined(__TURBOC__) || defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__) -#if defined(_Windows) || defined(WINNT) +#if defined(_WINDOWS_) || defined(WINNT) /* NOTE: Support for determining the window version by Luiz Rafael Culik Culik@sl.conex.net @@ -202,7 +202,7 @@ HARBOUR HB_OS( void ) hb_osletter = 0; } -#endif /* defined(_Windows) */ +#endif /* defined(_WINDOWS_) */ #else