aboutsummaryrefslogtreecommitdiffstats
path: root/common/types.h
diff options
context:
space:
mode:
Diffstat (limited to 'common/types.h')
-rw-r--r--common/types.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/common/types.h b/common/types.h
index 8d7730b2e..2bb817faf 100644
--- a/common/types.h
+++ b/common/types.h
@@ -114,13 +114,13 @@
#endif
-/* Some GCC attributes. Note that we use also define some in
- mischelp.h, but this header and types.h are not always included.
- Should eventually be put into one file (e.g. nlib-common.h). */
-#if __GNUC__ >= 4
-# define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
-#else
-# define GNUPG_GCC_A_SENTINEL(a)
+/* Some GCC attributes. These are replacements for libgpg-error < 1.20. */
+#ifndef GPGRT_GCC_VERSION
+# if __GNUC__ >= 4
+# define GPGRT_ATTR_SENTINEL(a) __attribute__ ((sentinel(a)))
+# else
+# define GPGRT_ATTR_SENTINEL(a)
+# endif
#endif
#endif /*GNUPG_COMMON_TYPES_H*/