fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

See ChangeLog entry 19990519-22:00 EST David G. Holm <dholm@jsd-llc.com>

Browse Source
This commit is contained in:
David G. Holm
1999-05-20 03:03:07 +00:00
parent c4d3c89a85
commit ddd9220261
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -1,3 +1,8 @@
19990519-22:00 EST David G. Holm <dholm@jsd-llc.com>
* source/rtl/environ.c
- Do Windows version check even when #if defined(_Windows).
- Don't attach version numbers if the major OS version number is unknown.
19990519-21:40 EST David G. Holm <dholm@jsd-llc.com>
* makefile.b31
- Modified to support changes to source/compiler/fixflex.c

13
harbour/source/rtl/environ.c
View File

@@ -29,7 +29,7 @@
HARBOUR OS()
{
int hb_osmajor, hb_osminor, hb_osletter;
int hb_osmajor = -1, hb_osminor = -1, hb_osletter = -1;
char * hb_os = 0;
char version [128];
#ifdef __IBMCPP__
@@ -54,7 +54,15 @@ HARBOUR OS()
#if defined(__TURBOC__) || defined(__BORLANDC__) || defined(__MSC__)
#if defined(_Windows)
hb_os = "Windows";
hb_os = "Windows 95/98";
_AX = 0x160A;
geninterrupt(0x2F);
if(_AX == 0)
{
hb_osmajor = _BX / 256;
hb_osminor = _BX % 256;
hb_osletter = 0;
}
#else
/* detect OS/2 */
if(_osmajor >= 10)
@@ -158,6 +166,7 @@ HARBOUR OS()
#endif /* __IBMCPP__ */
if (!hb_os) strcpy (version, "Unknown");
else if (hb_osmajor == -1) strcpy (version, hb_os);
else sprintf (version, "%s %d.%02d%c", hb_os, hb_osmajor, hb_osminor, hb_osletter);
_retc (version);
}