From 7ecef08518bdfc9d32dc896edc89e0ceef8f43ef Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 25 Aug 2008 16:29:01 +0000 Subject: [PATCH] 2008-08-25 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/common/hbver.c ! Fix to commit '2008-07-11 18:20 UTC+0200' which effectively disabled Vista/2008 detection for everything but MSVC (>1400) compilers. --- harbour/ChangeLog | 6 ++++++ harbour/source/common/hbver.c | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c6867f1453..7eb2891b44 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-08-25 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/common/hbver.c + ! Fix to commit '2008-07-11 18:20 UTC+0200' which + effectively disabled Vista/2008 detection for + everything but MSVC (>1400) compilers. + 2008-08-25 17:13 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * common.mak * utils/hbmake/Makefile diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c index 5a325c7410..fd459c6c6e 100644 --- a/harbour/source/common/hbver.c +++ b/harbour/source/common/hbver.c @@ -224,10 +224,7 @@ char * hb_verPlatform( void ) if( osVer.dwMajorVersion == 6 ) { -#if !defined(HB_WINCE) - #if defined(_MSC_VER) - #if (_MSC_VER >= 1400) - +#if !defined(HB_WINCE) && (!defined(_MSC_VER) || _MSC_VER >= 1400) OSVERSIONINFOEXA osVerEx; osVerEx.dwOSVersionInfoSize = sizeof( osVerEx ); @@ -240,8 +237,6 @@ char * hb_verPlatform( void ) pszName = "Windows Server 2008"; } else - #endif - #endif #endif pszName = "Windows"; }