Charles Davis : configure: Try harder to disable Fortify.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5252d19fbaa5c504dd6502f01736afa8fe62c068
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5252d19fbaa5c504dd6502f017...

Author: Charles Davis 
Date:   Tue Sep 22 15:57:00 2015 -0600

configure: Try harder to disable Fortify.

Signed-off-by: Charles Davis

---

configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 33f0343..b4bbb2f 100755
--- a/configure
+++ b/configure
@@ -14550,7 +14550,7 @@ else
 int
 main ()
 {
-#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0
+#if (defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0) || (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0)
 #error Fortify enabled
 #endif
   ;
diff --git a/configure.ac b/configure.ac
index 74ab202..ce631e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1898,7 +1898,7 @@ dnl **** Disable Fortify, it has too many false positives

AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled,
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],
-[[#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0
+[[#if (defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0) || (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0)
 #error Fortify enabled
 #endif]])],
         [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes]))