summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-10-10 14:51:46 +0000
committerJakub Jelinek <jakub@redhat.com>2005-10-10 14:51:46 +0000
commit2a61a5442b614a0f6b4b5c63501b641e83e8f229 (patch)
tree961710f1db68abe5e14c13f3cada17194cfdc9ad /include
parent74b2c78b9216d1d1642261da42bbe64544a667aa (diff)
Updated to fedora-glibc-20051010T1417
Diffstat (limited to 'include')
-rw-r--r--include/features.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/features.h b/include/features.h
index cb0844ddda..3288bb501c 100644
--- a/include/features.h
+++ b/include/features.h
@@ -262,18 +262,21 @@
# define __USE_REENTRANT 1
#endif
-#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 \
+#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
+ && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 \
&& (__GNUC_PREREQ (4, 1) \
|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \
|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \
&& __GNUC_MINOR__ == 4 \
&& (__GNUC_PATCHLEVEL__ > 2 \
|| (__GNUC_PATCHLEVEL__ == 2 && __GNUC_RH_RELEASE__ >= 8))))
-# if _FORTIFY_SOURCE == 1
-# define __USE_FORTIFY_LEVEL 1
-# elif _FORTIFY_SOURCE > 1
+# if _FORTIFY_SOURCE > 1
# define __USE_FORTIFY_LEVEL 2
+# else
+# define __USE_FORTIFY_LEVEL 1
# endif
+#else
+# define __USE_FORTIFY_LEVEL 0
#endif
/* We do support the IEC 559 math functionality, real and complex. */