diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-08-16 08:33:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 08:33:32 +0200 |
| commit | ea21d32221fe01306181d33f19cee06cbf367db4 (patch) | |
| tree | 7ec371a28d85038bd1b7dc7dbb5a63d0edbb3d7e | |
| parent | 1d6b85815057d39cb289d69b1526eddc9afc7ae6 (diff) | |
| parent | b344abde2f0676ecda529735264f1c41e3c5ee94 (diff) | |
| download | ATCD-ea21d32221fe01306181d33f19cee06cbf367db4.tar.gz | |
Merge pull request #1650 from jwillemsen/jwi-ace6tao2embarcadero
Updated Embarcadero version checks
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 88b54d708cd..fea108caa44 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -145,24 +145,16 @@ # endif /* !__MT__ */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#if (__BORLANDC__ <= 0x750) -# define ACE_LACKS_ISWCTYPE -# define ACE_LACKS_ISCTYPE -#endif - -#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x750) -# define ACE_LACKS_STRTOK_R -#endif +#define ACE_LACKS_ISWCTYPE +#define ACE_LACKS_ISCTYPE +#define ACE_LACKS_STRTOK_R +#define ACE_LACKS_ASCTIME_R #if (__BORLANDC__ <= 0x740) # define ACE_LACKS_LOCALTIME_R # define ACE_LACKS_GMTIME_R #endif -#if (__BORLANDC__ <= 0x750) -# define ACE_LACKS_ASCTIME_R -#endif - #define ACE_WCSDUP_EQUIVALENT ::_wcsdup #define ACE_STRCASECMP_EQUIVALENT ::stricmp #define ACE_STRNCASECMP_EQUIVALENT ::strnicmp |