From e2f0e0558c7d38bbb978951ac05272388543075b Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Thu, 3 Jun 1999 01:48:29 +0000 Subject: [PATCH] See ChangeLog entry 19990602-20:45 EDT David G. Holm --- harbour/ChangeLog | 5 +++++ harbour/source/rtl/environ.c | 11 ++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 398522240a..7927f3b4eb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,8 @@ +19990602-20:45 EDT David G. Holm + * source/rtl/environ.c + - Modified #ifdef _Windows section to return "Windows" + instead of "Windows 95/98". + 19990602-18:20 EDT David G. Holm * source/rtl/strings.c - Changed if( lLen > lSubLen ) to if( lLen >= lSubLen ) diff --git a/harbour/source/rtl/environ.c b/harbour/source/rtl/environ.c index a0ecb69f87..7df8194afd 100644 --- a/harbour/source/rtl/environ.c +++ b/harbour/source/rtl/environ.c @@ -54,15 +54,8 @@ HARBOUR OS() #if defined(__TURBOC__) || defined(__BORLANDC__) || defined(__MSC__) #if defined(_Windows) - hb_os = "Windows 95/98"; -/* _AX = 0x160A; - geninterrupt(0x2F); - if(_AX == 0) - { */ - hb_osmajor = _osmajor ; /* _BX / 256; */ - hb_osminor = _osminor ; /* _BX % 256; */ - hb_osletter = 0; -/* } */ + /* TODO: Determine the Windows type (32s/95/98/NT) and version */ + hb_os = "Windows"; #else /* detect OS/2 */ if(_osmajor >= 10)