remove configure test for inline keyword (#1231)

We require C99, so a configure test for this standard feature is not needed.

diff --git a/Include/pyport.h b/Include/pyport.h
index b535d7859ac6df14814ccf779d80dbb7e5a036c3..e3c4f899c0a43e42463b4cf915184dcafaeb3ebc 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -173,12 +173,9 @@ typedef int Py_ssize_clean_t;
 /* fastest possible local call under MSVC */
 #define Py_LOCAL(type) static type __fastcall
 #define Py_LOCAL_INLINE(type) static __inline type __fastcall
-#elif defined(USE_INLINE)
-#define Py_LOCAL(type) static type
-#define Py_LOCAL_INLINE(type) static inline type
 #else
 #define Py_LOCAL(type) static type
-#define Py_LOCAL_INLINE(type) static type
+#define Py_LOCAL_INLINE(type) static inline type
 #endif
 
 /* Py_MEMCPY is kept for backwards compatibility,

diff --git a/Modules/_sre.c b/Modules/_sre.c
index 84e2f933db3462f6adff6416e1d62cc42bb1ab4f..03a138ee0150272126355fde44a1a396ff5eed59 100644 (file)
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -66,10 +66,8 @@ static const char copyright[] =
 #pragma warning(disable: 4710) /* who cares if functions are not inlined ;-) */
 /* fastest possible local call under MSVC */
 #define LOCAL(type) static __inline type __fastcall
-#elif defined(USE_INLINE)
-#define LOCAL(type) static inline type
 #else
-#define LOCAL(type) static type
+#define LOCAL(type) static inline type
 #endif
 
 /* error codes */

diff --git a/configure b/configure
index ac16ce755be33437d29b9d2b9d0e71cb36972523..b4dc5f132884f560a7becb0737add9216bc21ade 100755 (executable)
--- a/configure
+++ b/configure
@@ -695,7 +695,6 @@ ARFLAGS
 ac_ct_AR
 AR
 RANLIB
-USE_INLINE
 GNULD
 LINKCC
 LDVERSION
@@ -5839,56 +5838,6 @@ esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNULD" >&5
 $as_echo "$GNULD" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-if test "$ac_cv_c_inline" != no ; then
-
-$as_echo "#define USE_INLINE 1" >>confdefs.h
-
-
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-shared" >&5
 $as_echo_n "checking for --enable-shared... " >&6; }
 # Check whether --enable-shared was given.

diff --git a/configure.ac b/configure.ac
index 73e64fd7581526c2990cc433d3d00a017f4c6a67..d7316b9fe85c3f4a916b184bd2c5c19d58f9b6a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1078,13 +1078,6 @@ case `"$ac_prog" -V 2>&1 < /dev/null` in
 esac
 AC_MSG_RESULT($GNULD)
 
-AC_C_INLINE
-if test "$ac_cv_c_inline" != no ; then
-        AC_DEFINE(USE_INLINE, 1, [Define to use the C99 inline keyword.])
-        AC_SUBST(USE_INLINE)
-fi
-
-
 AC_MSG_CHECKING(for --enable-shared)
 AC_ARG_ENABLE(shared,
               AS_HELP_STRING([--enable-shared], [disable/enable building shared python library]))

diff --git a/pyconfig.h.in b/pyconfig.h.in
index 21354a5cb84fe5530dd0d460561ba95569abe1d4..0a3d59ef9ae602fa02405c7b7068efaf7b55b21b 100644 (file)
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -1342,9 +1342,6 @@
 /* Define if you want to use computed gotos in ceval.c. */
 #undef USE_COMPUTED_GOTOS
 
-/* Define to use the C99 inline keyword. */
-#undef USE_INLINE
-
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
@@ -1484,12 +1481,6 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef 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
-#undef inline
-#endif
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef mode_t