Refactor compiler inline keyword check

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -255,13 +255,6 @@ php_check_builtin(__builtin_ssubl_overflow PHP_HAVE_BUILTIN_SSUBL_OVERFLOW)
 php_check_builtin(__builtin_ssubll_overflow PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW)
 php_check_builtin(__builtin_usub_overflow PHP_HAVE_BUILTIN_USUB_OVERFLOW)
 
-################################################################################
-# Check compiler characteristics.
-################################################################################
-
-# Check compiler inline keyword.
-include(PHP/CheckInline)
-
 ################################################################################
 # Check functions.
 ################################################################################
@@ -416,6 +409,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckFlushIo.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckFopencookie.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckGetaddrinfo.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckGethostbynameR.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckInline.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckIPv6.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckReentrantFunctions.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckWrite.cmake)

cmake/cmake/checks/CheckInline.cmake

@@ -0,0 +1,83 @@
+#[=============================================================================[
+Check if compiler supports 'inline', '__inline__', or '__inline' keyword.
+
+The 'inline' keyword is part of the C99 standard and all decent compilers should
+have it. See also Autoconf's 'AC_C_INLINE' and 'AX_C99_INLINE' macros.
+
+If compiler doesn't support any of the inline keywords, then an empty definition
+needs to be used so the code compiles as a workaround.
+
+Result/cache variables:
+
+* PHP_INLINE_KEYWORD_CODE - Header definition line that sets the compiler's
+  'inline' keyword.
+#]=============================================================================]
+
+include_guard(GLOBAL)
+
+include(CheckSourceCompiles)
+include(CMakePushCheckState)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(PHP_INLINE_KEYWORD_CODE "/* #undef inline */")
+  return()
+endif()
+
+function(_php_check_inline result)
+  set(${result} "")
+
+  message(CHECK_START "Checking C compiler inline keyword")
+
+  foreach(keyword "inline" "__inline__" "__inline")
+    cmake_push_check_state(RESET)
+      set(CMAKE_REQUIRED_DEFINITIONS -Dinline=${keyword})
+      set(CMAKE_REQUIRED_QUIET TRUE)
+
+      check_source_compiles(C [[
+        #ifndef __cplusplus
+          typedef int foo_t;
+          static inline foo_t static_foo(void) { return 0; }
+          inline foo_t foo(void) { return 0; }
+        #endif
+
+        int main(void) { return 0; }
+      ]] PHP_HAS_${keyword})
+    cmake_pop_check_state()
+
+    if(PHP_HAS_inline)
+      message(CHECK_PASS "inline")
+
+      set(${result} "/* #undef inline */")
+
+      return(PROPAGATE ${result})
+    endif()
+
+    if(PHP_HAS_${keyword})
+      message(CHECK_PASS "${keyword}")
+
+      set(${result} "#define inline ${keyword}")
+
+      return(PROPAGATE ${result})
+    endif()
+  endforeach()
+
+  if(NOT ${result})
+    message(CHECK_FAIL "not supported")
+    message(WARNING "Compiler doesn't support the C99 standard inline keyword")
+
+    set(${result} "#define inline")
+
+    return(PROPAGATE ${result})
+  endif()
+endfunction()
+
+if(NOT DEFINED PHP_INLINE_KEYWORD_CODE)
+  _php_check_inline(PHP_INLINE_KEYWORD_CODE)
+
+  set(
+    PHP_INLINE_KEYWORD_CODE
+    "${PHP_INLINE_KEYWORD_CODE}"
+    CACHE INTERNAL
+    "Compiler inline keyword definition."
+  )
+endif()

cmake/cmake/modules/PHP/CheckInline.cmake

@@ -667,6 +667,12 @@
 /* Define to 1 when using musl libc. */
 #cmakedefine __MUSL__ 1
 
+/* Define to '__inline__' or '__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+@PHP_INLINE_KEYWORD_CODE@
+#endif
+
 /*****************************************************************************
   PHP SAPIs configuration
  ****************************************************************************/
@@ -695,12 +701,6 @@
 /* Define to 'int' if <sys/types.h> doesn't define. */
 # cmakedefine gid_t @gid_t@
 
-/* Define to '__inline__' or '__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-# ifndef __cplusplus
-@INLINE_KEYWORD_DEFINITION@
-# endif
-
 /* Define to 'int' if <sys/types.h> doesn't define. */
 # cmakedefine uid_t @uid_t@