Tell compiler to adhere to C99 standards.

Exception being newer cmake versions that will decay to gnu99 in
certain situations. This decay currently hides a warning in minigzip,
but using C99 with C_STANDARD_REQUIRED on could potentially introduce
unknown problems on other platforms, so for now we will allow this decay.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86dbfd2eab4a0065b3576011051a4ab37e7919c8..dc416e0068818995f4a5104e973d880715ccb15a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,15 @@ include(CheckCSourceCompiles)
 include(CheckCSourceRuns)
 include(FeatureSummary)
 
+# Enable C99
+if (CMAKE_VERSION VERSION_LESS "3.1")
+    if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+        set (CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")
+    endif ()
+else ()
+    set (CMAKE_C_STANDARD 99)
+endif ()
+
 # make sure we use an appropriate BUILD_TYPE by default, "Release" to be exact
 # this should select the maximum generic optimisation on the current platform (i.e. -O3 for gcc/clang)
 if(NOT CMAKE_BUILD_TYPE)

diff --git a/configure b/configure
index 6916880ec580fcc8619b2b044e1e29a1e03addf3..61c6282c69c78a145734e1c724bb5d355f4e6cf1 100755 (executable)
--- a/configure
+++ b/configure
@@ -257,6 +257,7 @@ show $cc -c $test.c
 if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
   echo ... using gcc >> configure.log
   CC="$cc"
+  CFLAGS="${CFLAGS} -std=c99"
   # Re-check arch if gcc is a cross-compiler
   GCC_ARCH=`$CC -dumpmachine | sed 's/-.*//g'`
   case $GCC_ARCH in