From 32707d942bb36632156669820e202dad698596b8 Mon Sep 17 00:00:00 2001
From: "David G. Holm" <dholm@jsd-llc.com>
Date: Mon, 17 Jan 2000 23:54:41 +0000
Subject: [PATCH] See ChangeLog entry 2000-01-17 18:55 GMT-5 David G. Holm
 <dholm@ sd-llc.com>

---
 harbour/ChangeLog            | 5 +++++
 harbour/source/rtl/environ.c | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6185e98496..3899f1ab6e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-17 18:55 GMT-5 David G. Holm <dholm@ sd-llc.com>
+
+   * source/environ.c
+     ! Corrected manifest constant _Windows to be _WINDOWS_
+
 2000-01-17 15:30 GMT-5 David G. Holm <dholm@ sd-llc.com>
 
    * source/environ.c
diff --git a/harbour/source/rtl/environ.c b/harbour/source/rtl/environ.c
index 2a58b5ee32..0ca74cda6e 100644
--- a/harbour/source/rtl/environ.c
+++ b/harbour/source/rtl/environ.c
@@ -165,7 +165,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_)
 
 /* NOTE:
     Support for determining the window version by Luiz Rafael Culik
@@ -175,7 +175,6 @@ HARBOUR HB_OS( void )
     dezac@corevia.com
 */
 
-#define HB_OS_VERSION_WINDOWS
    OSVERSIONINFO osVer; /* for GetVersionEx() */
    char szBuild[ 128 ] = "";
    LONG lVersion;
@@ -364,7 +363,7 @@ HARBOUR HB_OS( void )
    if( ! hb_os ) strcpy( version, "Unknown" );
    else if( hb_osmajor == -1 ) strcpy( version, hb_os );
    else if( hb_osmajor == -2 ) { /* NOP */ }
-#ifdef HB_OS_VERSION_WINDOWS
+#ifdef _WINDOWS_
    else sprintf( version, cformat, hb_os, szBuild, hb_osmajor, hb_osminor, hb_osletter );
 #else
    else sprintf( version, cformat, hb_os, hb_osmajor, hb_osminor, hb_osletter );