Merge commit 'origin/master-tx'

[pulseaudio] / src / pulse / gccmacro.h

diff --git a/src/pulse/gccmacro.h b/src/pulse/gccmacro.h
index 0f751c03cea43add4df92a95c0be5232114404ca..e85ecb6617da731eb2286a2c574de5778dd532eb 100644 (file)
--- a/src/pulse/gccmacro.h
+++ b/src/pulse/gccmacro.h
@@ -8,7 +8,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published

-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -117,4 +117,11 @@
 #endif
 #endif
 
 #endif
 #endif
 

+#ifndef PA_GCC_WEAKREF
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ > 1)) || (__GNUC__ > 4))
+/** Macro for usgae of GCC's weakref attribute */
+#define PA_GCC_WEAKREF(x) __attribute__((weakref(#x)));
+#endif
+#endif
+

 #endif
 #endif