diff options
| author | Jack Lloyd <[email protected]> | 2020-01-25 11:56:16 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2020-01-25 11:56:16 -0500 |
| commit | 915b5c796f1d95a4258b6d03484710271eef8c0c (patch) | |
| tree | d68eb6e1b2f1441c41d699ba645c530864612390 /src/lib/utils/compiler.h | |
| parent | 240b71310baa5fc978f481caae6f7842aa77830b (diff) | |
| parent | 8afc681704950df8f6cae99408b53d9fc536f7e7 (diff) | |
Merge GH #2246 Remove support for ABI splitting the amalgamation
Diffstat (limited to 'src/lib/utils/compiler.h')
| -rw-r--r-- | src/lib/utils/compiler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h index 3f1dc4f8b..e30ecda71 100644 --- a/src/lib/utils/compiler.h +++ b/src/lib/utils/compiler.h @@ -103,7 +103,7 @@ #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated(msg))) #define BOTAN_DEPRECATED_HEADER(hdr) _Pragma("message \"this header is deprecated\"") - #if !defined(BOTAN_IS_BEING_BUILT) + #if !defined(BOTAN_IS_BEING_BUILT) && !defined(BOTAN_AMALGAMATION_H_) #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) _Pragma("message \"this header will be made internal in the future\"") #endif @@ -111,7 +111,7 @@ #define BOTAN_DEPRECATED(msg) __declspec(deprecated(msg)) #define BOTAN_DEPRECATED_HEADER(hdr) __pragma(message("this header is deprecated")) - #if !defined(BOTAN_IS_BEING_BUILT) + #if !defined(BOTAN_IS_BEING_BUILT) && !defined(BOTAN_AMALGAMATION_H_) #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) __pragma(message("this header will be made internal in the future")) #endif @@ -120,7 +120,7 @@ #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated(msg))) #define BOTAN_DEPRECATED_HEADER(hdr) _Pragma("GCC warning \"this header is deprecated\"") - #if !defined(BOTAN_IS_BEING_BUILT) + #if !defined(BOTAN_IS_BEING_BUILT) && !defined(BOTAN_AMALGAMATION_H_) #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) _Pragma("GCC warning \"this header will be made internal in the future\"") #endif #endif |