diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-27 13:46:45 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-05-27 13:46:45 -0400 |
| commit | a1abb27be261e07ea5b6620f4407b46344def3d3 (patch) | |
| tree | 4545a7099bab5993356b37df253dad2deb254737 /Utilities | |
| parent | 8838ea2ba53e40999d04d98325e28ef18df7481a (diff) | |
| parent | f171b651b46c99a9744c1fd3e1a8956dd0a667f0 (diff) | |
| download | cmake-a1abb27be261e07ea5b6620f4407b46344def3d3.tar.gz | |
Merge branch 'upstream-KWIML' into update-kwiml
# By KWIML Upstream
* upstream-KWIML:
KWIML 2022-05-27 (47070837)
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/KWIML/include/kwiml/int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/KWIML/include/kwiml/int.h b/Utilities/KWIML/include/kwiml/int.h index 25a063aafd..49da373255 100644 --- a/Utilities/KWIML/include/kwiml/int.h +++ b/Utilities/KWIML/include/kwiml/int.h @@ -719,7 +719,7 @@ An includer may test the following macros after inclusion: #endif #if defined(__INTEL_COMPILER) -#elif defined(__BORLANDC__) +#elif defined(__BORLANDC__) && !defined(__CODEGEARC_VERSION__) # define KWIML_INT_private_NO_FMTLL /* type 'long long' but not 'll' format */ # define KWIML_INT_BROKEN_INT64_C 1 /* system macro defined incorrectly */ # define KWIML_INT_BROKEN_UINT64_C 1 /* system macro defined incorrectly */ |