* include/features.h (__USE_FORTIFY_LEVEL): Enable even with

	Red Hat gcc4 4.0.0 and above.

diff --git a/ChangeLog b/ChangeLog
index 9978171580db946fa92e90baee7c3c774356b7a5..1239e711e863d31bf29a476724cefb09ef8780f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+       * include/features.h (__USE_FORTIFY_LEVEL): Enable even with
+       Red Hat gcc4 4.0.0 and above.
+
 2004-10-18  Jakub Jelinek  <jakub@redhat.com>
 
        * malloc/arena.c (ptmalloc_init): Don't use brk if dlopened

diff --git a/include/features.h b/include/features.h
index 9940304ccb1d43b1004e02302fb5b8e968b2b763..7551dcc5cc048d5fe9eeed63e3d459a17e26955e 100644 (file)
--- a/include/features.h
+++ b/include/features.h
@@ -262,7 +262,9 @@
 # define __USE_REENTRANT       1
 #endif
 
-#if _FORTIFY_SOURCE > 0 && __GNUC_PREREQ (4, 1) && __OPTIMIZE__ > 0
+#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 \
+    && (__GNUC_PREREQ (4, 1) \
+        || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)))
 # if _FORTIFY_SOURCE == 1
 #  define __USE_FORTIFY_LEVEL 1
 # elif _FORTIFY_SOURCE > 1