Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 294242e686b8a0bd7cff6705fe9309d070dff6e7..a0573398d891a595ca4733d73637632bfd150a57 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
@@ -94,8 +94,12 @@
 
 #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
@@ -134,7 +138,7 @@
 // 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_MINOR 14
 #define APT_PKG_RELEASE 0
 
 #endif