summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2013-08-19 17:47:29 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2013-08-20 10:38:07 +0200
commitffc3e8a32700194477d5d576c8bd3f7df853a6b1 (patch)
tree4334185fe4afa4073eae2e952c1aa75e2059956b
parentfe93908238196bd632287fc9875e6f2e11105d04 (diff)
Fix min gcc version for __attribute__(format)
We currently use it only on gcc 4.5 or newer, but it was actually introduced much earlier than that. It's documented in gcc 2.95.3 manual: http://gcc.gnu.org/onlinedocs/gcc-2.95.3/gcc_4.html#SEC84 and glib uses starting from gcc 2.2.5. This commit uses the same minimum version as glib. This was causing warnings on RHEL6 systems which have gcc 4.4.7
-rw-r--r--common/macros.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/common/macros.h b/common/macros.h
index cf7aaad..47289be 100644
--- a/common/macros.h
+++ b/common/macros.h
@@ -19,18 +19,14 @@
#ifndef __MACROS_H
#define __MACROS_H
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define SPICE_ATTR_PRINTF(a,b) \
- __attribute__((format(printf,a,b)))
-#else
-#define SPICE_ATTR_PRINTF(a,b)
-#endif /* __GNUC__ */
-
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)
#define SPICE_ATTR_NORETURN \
__attribute__((noreturn))
+#define SPICE_ATTR_PRINTF(a,b) \
+ __attribute__((format(printf,a,b)))
#else
#define SPICE_ATTR_NORETURN
+#define SPICE_ATTR_PRINTF
#endif /* __GNUC__ */