|
 |
25845f |
commit afb466fcb034f594e083b5664fa60a0d4f54c41b
|
|
|
25845f |
Author: Will Newton <will.newton@linaro.org>
|
|
|
25845f |
Date: Mon Mar 17 11:06:02 2014 +0000
|
|
|
25845f |
|
|
|
25845f |
Fix __STRICT_ANSI__ -Wundef warnings
|
|
|
25845f |
|
|
|
25845f |
ChangeLog:
|
|
|
25845f |
|
|
|
25845f |
2014-03-17 Will Newton <will.newton@linaro.org>
|
|
|
25845f |
|
|
|
25845f |
* argp/argp-fmtstream.h: Check whether
|
|
|
25845f |
__STRICT_ANSI__ is defined with #ifdef rather
|
|
|
25845f |
than #if.
|
|
|
25845f |
* argp/argp.h: Likewise.
|
|
|
25845f |
|
|
|
25845f |
diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h
|
|
|
25845f |
index f4140b924c13a302..61c45bf86b6bf8d5 100644
|
|
|
25845f |
--- a/argp/argp-fmtstream.h
|
|
|
25845f |
+++ b/argp/argp-fmtstream.h
|
|
|
25845f |
@@ -31,12 +31,14 @@
|
|
|
25845f |
|
|
|
25845f |
#ifndef __attribute__
|
|
|
25845f |
/* This feature is available in gcc versions 2.5 and later. */
|
|
|
25845f |
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
|
|
|
25845f |
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || \
|
|
|
25845f |
+ defined __STRICT_ANSI__
|
|
|
25845f |
# define __attribute__(Spec) /* empty */
|
|
|
25845f |
# endif
|
|
|
25845f |
/* The __-protected variants of `format' and `printf' attributes
|
|
|
25845f |
are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
|
|
|
25845f |
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__
|
|
|
25845f |
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
|
|
|
25845f |
+ defined __STRICT_ANSI__
|
|
|
25845f |
# define __format__ format
|
|
|
25845f |
# define __printf__ printf
|
|
|
25845f |
# endif
|
|
|
25845f |
diff --git a/argp/argp.h b/argp/argp.h
|
|
|
25845f |
index 8fb7098061443ba8..37544fe44a102574 100644
|
|
|
25845f |
--- a/argp/argp.h
|
|
|
25845f |
+++ b/argp/argp.h
|
|
|
25845f |
@@ -38,12 +38,14 @@
|
|
|
25845f |
|
|
|
25845f |
#ifndef __attribute__
|
|
|
25845f |
/* This feature is available in gcc versions 2.5 and later. */
|
|
|
25845f |
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
|
|
|
25845f |
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || \
|
|
|
25845f |
+ defined __STRICT_ANSI__
|
|
|
25845f |
# define __attribute__(Spec) /* empty */
|
|
|
25845f |
# endif
|
|
|
25845f |
/* The __-protected variants of `format' and `printf' attributes
|
|
|
25845f |
are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
|
|
|
25845f |
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__
|
|
|
25845f |
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
|
|
|
25845f |
+ defined __STRICT_ANSI__
|
|
|
25845f |
# define __format__ format
|
|
|
25845f |
# define __printf__ printf
|
|
|
25845f |
# endif
|