Seems okay although probably the VER_NT_WORKSTATION check is
enough and MSC_VER check can be dropped. It'd be also better
to use some official macro to find out the required WSDK
version.

Brgds,
Viktor

On 2009.09.02., at 7:26, [email protected] wrote:

Revision: 12395
         
http://harbour-project.svn.sourceforge.net/harbour-project/?rev=12395&view=rev
Author:   druzus
Date:     2009-09-02 17:26:55 +0000 (Wed, 02 Sep 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
   trunk/harbour/ChangeLog
   trunk/harbour/source/common/hbver.c

Modified: trunk/harbour/ChangeLog
===================================================================
--- trunk/harbour/ChangeLog     2009-09-02 15:10:43 UTC (rev 12394)
+++ trunk/harbour/ChangeLog     2009-09-02 17:26:55 UTC (rev 12395)
@@ -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

Modified: trunk/harbour/source/common/hbver.c
===================================================================
--- trunk/harbour/source/common/hbver.c 2009-09-02 15:10:43 UTC (rev 12394) +++ trunk/harbour/source/common/hbver.c 2009-09-02 17:26:55 UTC (rev 12395)
@@ -296,7 +296,9 @@

               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 );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
Harbour mailing list
[email protected]
http://lists.harbour-project.org/mailman/listinfo/harbour

Reply via email to