diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | win32/config.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 44710d57..9bd15182 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_MAINTAINER_MODE AC_CANONICAL_HOST +AC_MINGW32 AM_PROG_LIBTOOL AM_PROG_CC_C_O @@ -209,7 +210,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])], CFLAGS="$saved_CFLAGS $SYMBOL_VISIBILITY" AC_SUBST(SYMBOL_VISIBILITY) -ac_build_stack_protector=yes +ac_build_stack_protector=no +if test "x$ac_cv_c_compiler_gnu" = "xyes" && test "x$MINGW32" != "xyes" ; then AC_ARG_ENABLE(stack-protector, AS_HELP_STRING([--disable-stack-protector],[Disable compiler stack hardening]), [ @@ -231,6 +233,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([void main(void){char foo;}])], CFLAGS="$saved_CFLAGS $STACK_PROTECTOR" fi fi +fi CFLAGS="$CFLAGS -W" diff --git a/win32/config.h b/win32/config.h index 4b8cb6da..6d32620f 100644 --- a/win32/config.h +++ b/win32/config.h @@ -3,7 +3,6 @@ #define CELT_BUILD 1 -#define restrict #define inline __inline #define getpid _getpid |