diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2020-08-06 18:30:17 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2020-08-06 18:30:17 -0400 |
| commit | 204e4d6ca8d8ca3e033dc821fa7c9c421a09d962 (patch) | |
| tree | e85fc67efca90316cf815c9399f7acbf8c38e128 /TestPrograms | |
| parent | 96344bc7673ede21ca8032961e8e8c5640e108b8 (diff) | |
| download | cryptopp-git-204e4d6ca8d8ca3e033dc821fa7c9c421a09d962.tar.gz | |
Fix compiler versions for test programs
Diffstat (limited to 'TestPrograms')
| -rw-r--r-- | TestPrograms/test_cxx11_noexcept.cxx | 8 | ||||
| -rw-r--r-- | TestPrograms/test_ppc_power7.cxx | 8 | ||||
| -rw-r--r-- | TestPrograms/test_ppc_power8.cxx | 8 | ||||
| -rw-r--r-- | TestPrograms/test_ppc_power9.cxx | 8 |
4 files changed, 20 insertions, 12 deletions
diff --git a/TestPrograms/test_cxx11_noexcept.cxx b/TestPrograms/test_cxx11_noexcept.cxx index 6d2a9e2a..5be9d597 100644 --- a/TestPrograms/test_cxx11_noexcept.cxx +++ b/TestPrograms/test_cxx11_noexcept.cxx @@ -1,8 +1,10 @@ -#define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10)
+#if defined(__GNUC_MAJOR__)
+# define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10)
+#endif
-#if defined(__apple_build_version__)
+#if defined(__clang_major__) && defined(__apple_build_version__)
# define APPLE_VERSION (__clang_major__*1000 + __clang_minor__*10)
-#else
+#elif defined(__clang_major__)
# define LLVM_VERSION (__clang_major__*1000 + __clang_minor__*10)
#endif
diff --git a/TestPrograms/test_ppc_power7.cxx b/TestPrograms/test_ppc_power7.cxx index 7ad1324d..22b791d6 100644 --- a/TestPrograms/test_ppc_power7.cxx +++ b/TestPrograms/test_ppc_power7.cxx @@ -1,8 +1,10 @@ -#define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10)
+#if defined(__GNUC_MAJOR__)
+# define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10)
+#endif
-#if defined(__apple_build_version__)
+#if defined(__clang_major__) && defined(__apple_build_version__)
# define APPLE_VERSION (__clang_major__*1000 + __clang_minor__*10)
-#else
+#elif defined(__clang_major__)
# define LLVM_VERSION (__clang_major__*1000 + __clang_minor__*10)
#endif
diff --git a/TestPrograms/test_ppc_power8.cxx b/TestPrograms/test_ppc_power8.cxx index bd678503..00a3309c 100644 --- a/TestPrograms/test_ppc_power8.cxx +++ b/TestPrograms/test_ppc_power8.cxx @@ -1,8 +1,10 @@ -#define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10)
+#if defined(__GNUC_MAJOR__)
+# define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10)
+#endif
-#if defined(__apple_build_version__)
+#if defined(__clang_major__) && defined(__apple_build_version__)
# define APPLE_VERSION (__clang_major__*1000 + __clang_minor__*10)
-#else
+#elif defined(__clang_major__)
# define LLVM_VERSION (__clang_major__*1000 + __clang_minor__*10)
#endif
diff --git a/TestPrograms/test_ppc_power9.cxx b/TestPrograms/test_ppc_power9.cxx index b93e4395..d7951f47 100644 --- a/TestPrograms/test_ppc_power9.cxx +++ b/TestPrograms/test_ppc_power9.cxx @@ -1,8 +1,10 @@ -#define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10)
+#if defined(__GNUC_MAJOR__)
+# define GNUC_VERSION (__GNUC__*1000 + __GNUC_MAJOR__*10)
+#endif
-#if defined(__apple_build_version__)
+#if defined(__clang_major__) && defined(__apple_build_version__)
# define APPLE_VERSION (__clang_major__*1000 + __clang_minor__*10)
-#else
+#elif defined(__clang_major__)
# define LLVM_VERSION (__clang_major__*1000 + __clang_minor__*10)
#endif
|