From 7b344d773d002a1b09e5bc9886291ecdf9b719ae Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 11 Apr 2021 00:31:35 +0100 Subject: [PATCH] Change how old Borland DOS compilers are detected. --- setter/src/dos/dos.c | 2 +- setter/src/dos/dosdefs.h | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/setter/src/dos/dos.c b/setter/src/dos/dos.c index edabf22..edff90a 100644 --- a/setter/src/dos/dos.c +++ b/setter/src/dos/dos.c @@ -139,7 +139,7 @@ unsigned int _dos_getdiskfree_ex(unsigned int drive, struct diskfree_ex_t* disks #endif } -#if defined(__BORLANDC__) && __BORLANDC__ <= 0x200 +#ifdef OLD_BORLAND unsigned _dos_write(int handle, void far* buf, unsigned len, unsigned* nwritten) { int ret; diff --git a/setter/src/dos/dosdefs.h b/setter/src/dos/dosdefs.h index 48fc1d3..9ffb659 100644 --- a/setter/src/dos/dosdefs.h +++ b/setter/src/dos/dosdefs.h @@ -36,6 +36,14 @@ Copyright (C) 2011-2021 Natalia Portillo #define __dos_mkdir(path) mkdir(path) #endif +#if defined(__BORLANDC__) && __BORLANDC__ <= 0x200 +#define OLD_BORLAND 1 +#endif + +#if defined(__TURBOC__) && __TURBOC__ <= 0x297 && !defined(OLD_BORLAND) +#define OLD_BORLAND 1 +#endif + #if defined(__WATCOMC__) #pragma pack(__push, 1) #else @@ -85,7 +93,7 @@ unsigned int _dos_getdiskfree_ex(unsigned int drive, struct diskfree_ex_t* disks #endif // Seems these were defined starting in Borland C++ 3.0 -#if defined(__BORLANDC__) && __BORLANDC__ <= 0x200 +#ifdef OLD_BORLAND #include #define _dos_setfileattr(path, attrib) _chmod(path, 1, attrib)