about summary refs log tree commit diff
path: root/argp
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-03-17 11:06:02 +0000
committerWill Newton <will.newton@linaro.org>2014-03-17 16:05:23 +0000
commitafb466fcb034f594e083b5664fa60a0d4f54c41b (patch)
tree1b5be9c7caf92cb54aff654384a0d347c4d8e5b1 /argp
parentf7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421 (diff)
downloadglibc-afb466fcb034f594e083b5664fa60a0d4f54c41b.tar.gz
glibc-afb466fcb034f594e083b5664fa60a0d4f54c41b.tar.xz
glibc-afb466fcb034f594e083b5664fa60a0d4f54c41b.zip
Fix __STRICT_ANSI__ -Wundef warnings
ChangeLog:

2014-03-17  Will Newton  <will.newton@linaro.org>

	* argp/argp-fmtstream.h: Check whether
	__STRICT_ANSI__ is defined with #ifdef rather
	than #if.
	* argp/argp.h: Likewise.
Diffstat (limited to 'argp')
-rw-r--r--argp/argp-fmtstream.h6
-rw-r--r--argp/argp.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h
index a5a101965c..1ed2834586 100644
--- a/argp/argp-fmtstream.h
+++ b/argp/argp-fmtstream.h
@@ -31,12 +31,14 @@
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || \
+  defined __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
+  defined __STRICT_ANSI__
 #  define __format__ format
 #  define __printf__ printf
 # endif
diff --git a/argp/argp.h b/argp/argp.h
index 3845172afa..0868228f83 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -37,12 +37,14 @@
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || \
+  defined __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
+  defined __STRICT_ANSI__
 #  define __format__ format
 #  define __printf__ printf
 # endif