Fix -Werror=strict-prototypes build

This should fix the rest of -Wstrict-prototypes warnings and
-Werror=strict-prototypes build issues. CMake still needs to be adjusted
for this to work properly and this might be fully working only in future
versions.

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -66,7 +66,7 @@ check_include_file(sys/time.h HAVE_SYS_TIME_H)
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(sys/uio.h HAVE_SYS_UIO_H)
 check_include_file(sys/utsname.h HAVE_SYS_UTSNAME_H)
-# Solaris <= 10, other systems have statvfs.h.
+# Solaris <= 10, other systems have sys/statvfs.h.
 check_include_file(sys/vfs.h HAVE_SYS_VFS_H)
 check_include_file(sys/wait.h HAVE_SYS_WAIT_H)
 check_include_file(sysexits.h HAVE_SYSEXITS_H)
@@ -242,9 +242,7 @@ endif()
 ################################################################################
 
 check_symbol_exists(alphasort "dirent.h" HAVE_ALPHASORT)
-check_symbol_exists(asctime_r "time.h" HAVE_ASCTIME_R)
 check_symbol_exists(chroot "unistd.h" HAVE_CHROOT)
-check_symbol_exists(ctime_r "time.h" HAVE_CTIME_R)
 check_symbol_exists(explicit_memset "string.h" HAVE_EXPLICIT_MEMSET)
 check_symbol_exists(fdatasync "unistd.h" HAVE_FDATASYNC)
 
@@ -274,13 +272,11 @@ check_symbol_exists(getservbyname "netdb.h" HAVE_GETSERVBYNAME)
 check_symbol_exists(getservbyport "netdb.h" HAVE_GETSERVBYPORT)
 check_symbol_exists(getrusage "sys/resource.h" HAVE_GETRUSAGE)
 check_symbol_exists(gettimeofday "sys/time.h" HAVE_GETTIMEOFDAY)
-check_symbol_exists(gmtime_r "time.h" HAVE_GMTIME_R)
 check_symbol_exists(getpwnam_r "pwd.h" HAVE_GETPWNAM_R)
 check_symbol_exists(getgrnam_r "grp.h" HAVE_GETGRNAM_R)
 check_symbol_exists(getpwuid_r "pwd.h" HAVE_GETPWUID_R)
 check_symbol_exists(getwd "unistd.h" HAVE_GETWD)
 check_symbol_exists(glob "glob.h" HAVE_GLOB)
-check_symbol_exists(localtime_r "time.h" HAVE_LOCALTIME_R)
 check_symbol_exists(lchown "unistd.h" HAVE_LCHOWN)
 check_symbol_exists(memcntl "sys/mman.h" HAVE_MEMCNTL)
 
@@ -330,7 +326,6 @@ cmake_push_check_state(RESET)
   check_symbol_exists(strptime "time.h" HAVE_STRPTIME)
 cmake_pop_check_state()
 
-check_symbol_exists(strtok_r "string.h" HAVE_STRTOK_R)
 check_symbol_exists(symlink "unistd.h" HAVE_SYMLINK)
 check_symbol_exists(tzset "time.h" HAVE_TZSET)
 check_symbol_exists(unsetenv "stdlib.h" HAVE_UNSETENV)
@@ -361,8 +356,8 @@ check_symbol_exists(strlcat "string.h" HAVE_STRLCAT)
 check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
 check_symbol_exists(explicit_bzero "string.h" HAVE_EXPLICIT_BZERO)
 
-# Check for missing declarations of reentrant functions.
-include(PHP/CheckMissingTimeR)
+# Check reentrant functions.
+include(PHP/CheckReentrantFunctions)
 
 # Check fopencookie.
 include(PHP/CheckFopencookie)

cmake/cmake/modules/PHP/CheckFclose.cmake

@@ -14,7 +14,7 @@ include_guard(GLOBAL)
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
-message(CHECK_START "Checking for fclose declaration")
+message(CHECK_START "Checking fclose declaration")
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
@@ -23,7 +23,7 @@ cmake_push_check_state(RESET)
     #include <stdio.h>
 
     int main(void) {
-      int (*func)() = fclose;
+      int (*func)(void) = fclose;
 
       return 0;
     }
@@ -38,5 +38,5 @@ if(NOT HAVE_FCLOSE_DECL)
     CACHE INTERNAL "Whether fclose declaration is missing"
   )
 else()
-  message(CHECK_PASS "ok")
+  message(CHECK_PASS "found")
 endif()

cmake/cmake/modules/PHP/CheckMissingTimeR.cmake

@@ -0,0 +1,100 @@
+#[=============================================================================[
+Check for reentrant functions and their declarations.
+
+Some systems didn't declare some reentrant functions if _REENTRANT was not
+defined. This is mostly obsolete and is intended for the PHP code specific
+usage. The check_symbol_exists() is sufficient to check for reentrant functions
+on current systems and this module might be obsolete in the future.
+
+Cache variables:
+
+  HAVE_LOCALTIME_R
+    Whether localtime_r() is available.
+  MISSING_LOCALTIME_R_DECL
+    Whether localtime_r is not declared.
+  HAVE_GMTIME_R
+    Whether gmtime_r() is available.
+  MISSING_GMTIME_R_DECL
+    Whether gmtime_r is not declared.
+  HAVE_ASCTIME_R
+    Whether asctime_r() is available.
+  MISSING_ASCTIME_R_DECL
+    Whether asctime_r is not declared.
+  HAVE_CTIME_R
+    Whether ctime_r() is available.
+  MISSING_CTIME_R_DECL
+    Whether ctime_r is not declared.
+  HAVE_STRTOK_R
+    Whether strtok_r() is available.
+  MISSING_STRTOK_R_DECL
+    Whether strtok_r is not declared.
+]=============================================================================]#
+
+include_guard(GLOBAL)
+
+include(CheckFunctionExists)
+include(CheckSourceCompiles)
+include(CMakePushCheckState)
+
+# Define HAVE_<symbol> if linker sees the function, and MISSING_<symbol>_DECL if
+# function is not declared by checking the required header and given test body.
+function(_php_check_reentrant_function symbol header body)
+  string(TOUPPER "${symbol}" const)
+
+  # Check if linker sees the function.
+  check_function_exists(${symbol} HAVE_${const})
+
+  message(CHECK_START "Checking ${symbol} declaration")
+
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_source_compiles(C "
+      #include <${header}>
+      int main(void) {
+        ${body};
+        return 0;
+      }
+    " _have_${symbol}_declaration)
+  cmake_pop_check_state()
+
+  if(NOT _have_${symbol}_declaration)
+    message(CHECK_FAIL "missing")
+
+    set(
+      MISSING_${const}_DECL 1
+      CACHE INTERNAL "Define if ${symbol} is not declared."
+    )
+  else()
+    message(CHECK_PASS "found")
+  endif()
+endfunction()
+
+_php_check_reentrant_function(
+  localtime_r
+  time.h
+  "struct tm *(*func)(void) = localtime_r"
+)
+
+_php_check_reentrant_function(
+  gmtime_r
+  time.h
+  "struct tm *(*func)(void) = gmtime_r"
+)
+
+_php_check_reentrant_function(
+  asctime_r
+  time.h
+  "char *(*func)(void) = asctime_r"
+)
+_php_check_reentrant_function(
+  ctime_r
+  time.h
+  "char *(*func)(void) = ctime_r"
+)
+
+_php_check_reentrant_function(
+  strtok_r
+  string.h
+  "char *(*func)(void) = strtok_r"
+)