From 0a8980a100e2d16be485c83850d1b1ff3dac4084 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Wed, 2 Sep 2009 17:26:55 +0000
Subject: [PATCH] 2009-09-02 19:26 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/source/common/hbver.c     ! added
 additional hack for conditional code used for Windows detection       to work
 with VC98.       Viktor please verify it but this condition:          (
 !defined( _MSC_VER ) || _MSC_VER >= 1400 )       was not enough.

---
 harbour/ChangeLog             | 8 ++++++++
 harbour/source/common/hbver.c | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 359c5c3b73..bfc60d95d4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-02 19:26 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/common/hbver.c
+    ! added additional hack for conditional code used for Windows detection
+      to work with VC98.
+      Viktor please verify it but this condition:
+         ( !defined( _MSC_VER ) || _MSC_VER >= 1400 )
+      was not enough.
+
 2009-09-02 17:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbnetio/netio.h
     * added small description
diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c
index 602a04c72b..a274b5ded6 100644
--- a/harbour/source/common/hbver.c
+++ b/harbour/source/common/hbver.c
@@ -296,7 +296,9 @@ char * hb_verPlatform( void )
 
                if( osVer.dwMajorVersion == 6 )
                {
-#if !defined( HB_OS_WIN_CE ) && !defined( __DMC__ ) && ( !defined( _MSC_VER ) || _MSC_VER >= 1400 )
+#if !defined( HB_OS_WIN_CE ) && !defined( __DMC__ ) && \
+    ( !defined( _MSC_VER ) || _MSC_VER >= 1400 ) && \
+    defined( VER_NT_WORKSTATION )
                   OSVERSIONINFOEXA osVerEx;
 
                   osVerEx.dwOSVersionInfoSize = sizeof( osVerEx );