1 files changed, 41 insertions, 16 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 03f8b8f2e..fb5e5fabc 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -2,7 +2,15 @@
 #ifndef BOTAN_BUILD_CONFIG_H__
 #define BOTAN_BUILD_CONFIG_H__
 
-/* This file was automatically generated %{timestamp} UTC */
+/*
+* This file was automatically generated %{timestamp} UTC by
+* %{user}@%{hostname} running '%{command_line}'
+*
+* Target
+*  - Compiler: %{cc} %{lib_opt} %{mach_opt}
+*  - Arch: %{submodel}/%{arch}
+*  - OS: %{os}
+*/
 
 #define BOTAN_VERSION_MAJOR %{version_major}
 #define BOTAN_VERSION_MINOR %{version_minor}
@@ -57,30 +65,47 @@
 
 %{target_compiler_defines}
 
-#if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
+#if defined(_MSC_VER)
   // 4250: inherits via dominance (diamond inheritence issue)
   // 4251: needs DLL interface (STL DLL exports)
   #pragma warning(disable: 4250 4251)
 #endif
 
-/* Module definitions */
-%{module_defines}
+/*
+* Compile-time deprecatation warnings
+*/
+#if !defined(BOTAN_NO_DEPRECATED_WARNINGS)
 
-/* Local configuration options */
-%{local_config}
+  #if defined(__clang__)
+    #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated))
 
-/*
-%{user}@%{hostname} ran '%{command_line}'
+  #elif defined(_MSC_VER)
+    #define BOTAN_DEPRECATED(msg) __declspec(deprecated(msg))
+
+  #elif defined(__GNUG__)
 
-Target
--------
-Compiler: %{cc} %{lib_opt} %{mach_opt}
-Arch: %{submodel}/%{arch}
-OS: %{os}
+    #if BOTAN_GCC_VERSION >= 450
+      #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated(msg)))
+    #else
+      #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated))
+    #endif
 
-Modules
--------
-%{mod_list}
+  #endif
+
+#endif
+
+#if !defined(BOTAN_DEPRECATED)
+  #define BOTAN_DEPRECATED(msg)
+#endif
+
+/*
+* Module availability definitions
 */
+%{module_defines}
+
+/*
+* Local configuration options (if any) follow
+*/
+%{local_config}
 
 #endif