From d179678fe398d9fba22b204a576747397e01d584 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Tue, 19 Sep 2017 12:52:04 -0400 Subject: Move the annotations to compiler.h since the user shouldn't modify --- src/build-data/buildh.in | 23 ----------------------- src/lib/utils/compiler.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in index f7e0ad71c..e1337318e 100644 --- a/src/build-data/buildh.in +++ b/src/build-data/buildh.in @@ -36,29 +36,6 @@ #define BOTAN_DLL %{visibility_attribute} #endif -/** -* Used to annotate API exports which are public and supported. -* These APIs will not be broken/removed unless strictly required for -* functionality or security, and only in new major versions. -* @param maj The major version this public API was released in -* @param min The minor version this public API was released in -*/ -#define BOTAN_PUBLIC_API(maj,min) BOTAN_DLL - -/** -* Used to annotate API exports which are public and can be used by -* applications if needed, but which are intentionally not documented, -* and which may change incompatibly in a future major version. -*/ -#define BOTAN_UNSTABLE_API BOTAN_DLL - -/** -* Used to annotate API exports which are exported but only for the -* purposes of testing. They should not be used by applications and -* may be removed or changed without notice. -*/ -#define BOTAN_TEST_API BOTAN_DLL - /* Target identification and feature test macros */ %{target_os_defines} diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h index 2c9248b1e..793220b00 100644 --- a/src/lib/utils/compiler.h +++ b/src/lib/utils/compiler.h @@ -13,6 +13,29 @@ #define BOTAN_USE_GCC_INLINE_ASM 1 #endif +/** +* Used to annotate API exports which are public and supported. +* These APIs will not be broken/removed unless strictly required for +* functionality or security, and only in new major versions. +* @param maj The major version this public API was released in +* @param min The minor version this public API was released in +*/ +#define BOTAN_PUBLIC_API(maj,min) BOTAN_DLL + +/** +* Used to annotate API exports which are public and can be used by +* applications if needed, but which are intentionally not documented, +* and which may change incompatibly in a future major version. +*/ +#define BOTAN_UNSTABLE_API BOTAN_DLL + +/** +* Used to annotate API exports which are exported but only for the +* purposes of testing. They should not be used by applications and +* may be removed or changed without notice. +*/ +#define BOTAN_TEST_API BOTAN_DLL + /* * Define BOTAN_GCC_VERSION */ -- cgit v1.2.3