Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records

[apt.git] / apt-pkg / contrib / macros.h

diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 294242e686b8a0bd7cff6705fe9309d070dff6e7..afa385c75cfaf9e0b5b0cacae69d89e85d960c2b 100644 (file)
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -71,13 +71,13 @@
 #endif
 
 #if APT_GCC_VERSION >= 0x0300
-       #define APT_UNUSED      __attribute__((unused))
+       #define APT_DEPRECATED  __attribute__ ((deprecated))
        #define APT_CONST       __attribute__((const))
        #define APT_PURE        __attribute__((pure))
        #define APT_NORETURN    __attribute__((noreturn))
        #define APT_PRINTF(n)   __attribute__((format(printf, n, n + 1)))
 #else
-       #define APT_UNUSED
+       #define APT_DEPRECATED
        #define APT_CONST
        #define APT_PURE
        #define APT_NORETURN
@@ -89,13 +89,17 @@
        #define APT_MUSTCHECK           __attribute__((warn_unused_result))
 #else
        #define APT_NONNULL(...)
-       #define APT_REQRET
+       #define APT_MUSTCHECK
 #endif
 
 #if APT_GCC_VERSION >= 0x0400
        #define APT_SENTINEL    __attribute__((sentinel))
+       #define APT_PUBLIC __attribute__ ((visibility ("default")))
+       #define APT_HIDDEN __attribute__ ((visibility ("hidden")))
 #else
        #define APT_SENTINEL
+       #define APT_PUBLIC
+       #define APT_HIDDEN
 #endif
 
 // cold functions are unlikely() to be called
@@ -103,8 +107,8 @@
        #define APT_COLD        __attribute__ ((__cold__))
        #define APT_HOT         __attribute__ ((__hot__))
 #else
-       #define __cold
-       #define __hot
+       #define APT_COLD
+       #define APT_HOT
 #endif
 
 #ifndef APT_10_CLEANER_HEADERS
@@ -128,13 +132,36 @@
 #endif
 #endif
 
+#if __GNUC__ >= 4
+       #define APT_IGNORE_DEPRECATED_PUSH \
+               _Pragma("GCC diagnostic push") \
+               _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+       #define APT_IGNORE_DEPRECATED_POP \
+               _Pragma("GCC diagnostic pop")
+       #define APT_IGNORE_DEPRECATED(XXX) \
+               APT_IGNORE_DEPRECATED_PUSH \
+               XXX \
+               APT_IGNORE_DEPRECATED_POP
+#else
+       #define APT_IGNORE_DEPRECATED_PUSH
+       #define APT_IGNORE_DEPRECATED_POP
+       #define APT_IGNORE_DEPRECATED(XXX) XXX
+#endif
+
+#if __cplusplus >= 201103L
+       #define APT_OVERRIDE override
+#else
+       #define APT_OVERRIDE /* no c++11 standard */
+#endif
+
 // These lines are extracted by the makefiles and the buildsystem
 // Increasing MAJOR or MINOR results in the need of recompiling all
 // reverse-dependencies of libapt-pkg against the new SONAME.
 // Non-ABI-Breaks should only increase RELEASE number.
 // See also buildlib/libversion.mak
-#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 12
+#define APT_PKG_MAJOR 5
+#define APT_PKG_MINOR 0
 #define APT_PKG_RELEASE 0
+#define APT_PKG_ABI ((APT_PKG_MAJOR * 100) + APT_PKG_MINOR)
 
 #endif