diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-31 15:59:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-31 15:59:35 (GMT) |
| commit | 61653ab7d34037183c38e2f04028ec6dc293d4f3 (patch) | |
| tree | 02d238d37fcdc161bafbc1b4e601b67a8157ffbe /Utilities | |
| parent | 8c11f0d33a07a72867303fd316fe89ea7047856d (diff) | |
| parent | a1abb27be261e07ea5b6620f4407b46344def3d3 (diff) | |
| download | CMake-61653ab7d34037183c38e2f04028ec6dc293d4f3.zip CMake-61653ab7d34037183c38e2f04028ec6dc293d4f3.tar.gz CMake-61653ab7d34037183c38e2f04028ec6dc293d4f3.tar.bz2 | |
Merge topic 'update-kwiml'
a1abb27be2 Merge branch 'upstream-KWIML' into update-kwiml
f171b651b4 KWIML 2022-05-27 (47070837)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7304
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 25a063a..49da373 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 */ |