* configure.in: Test for 'inline' support.

* k5-platform.h (inline): Don't define here.
* win-mac.h (inline): Define as __inline.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16536 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index cf201aa71c784cce0c44eb26fc3533236f4e1d82..00c437d7970f1e74f3cb40427ea2f982dc7167a1 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-01  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: Test for 'inline' support.
+       * k5-platform.h (inline): Don't define here.
+       * win-mac.h (inline): Define as __inline.
+
 2004-06-30  Ken Raeburn  <raeburn@mit.edu>
 
        * k5-thread.h (k5_debug_assert_locked, k5_debug_assert_unlocked):

diff --git a/src/include/configure.in b/src/include/configure.in
index 818398185c6e266d533ac7251b1324b9e67640a9..b3dbb2ac1db633234d8b59a41846424ad5ca7dbc 100644 (file)
--- a/src/include/configure.in
+++ b/src/include/configure.in
@@ -229,6 +229,8 @@ else
 fi
 AC_SUBST(maybe_kerberosIV)
 dnl
+AC_C_INLINE
+dnl
 dnl Not used yet, but let's find out what we've got on the platforms
 dnl we're working with....
 AC_CHECK_HEADERS(inttypes.h stdint.h)

diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h
index f0966f9831c52c76309c8d1bcb6e73c1f2834286..bf8a584322630547a0001b71d625785cc83b58dc 100644 (file)
--- a/src/include/k5-platform.h
+++ b/src/include/k5-platform.h
@@ -37,25 +37,8 @@
 #ifndef K5_PLATFORM_H
 #define K5_PLATFORM_H
 
-#if !defined(inline)
-# if __STDC_VERSION__ >= 199901L
-/* C99 supports inline, don't do anything.  */
-# elif defined(__GNUC__)
-#  define inline __inline__ /* this form silences -pedantic warnings */
-# elif defined(__mips) && defined(__sgi)
-#  define inline __inline /* IRIX used at MIT does inline but not c99 yet */
-# elif defined(__sun) && __SUNPRO_C >= 0x540
-/* The Forte Developer 7 C compiler supports "inline".  */
-# elif defined(_WIN32)
-#  define inline __inline
-# else
-#  define inline /* nothing, just static */
-# endif
-#endif
-
 #include "autoconf.h"
 
-
 /* Initialization and finalization function support for libraries.
 
    At top level, before the functions are defined or even declared:

diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index 8811dbd58c60d7a08fb8b3d03327cb780714329f..ece6e126c41da183943763c6c168e2440394bf93 100644 (file)
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -74,6 +74,8 @@ typedef unsigned char u_char;
 #define NO_PASSWORD
 #define HAVE_STRERROR
 #define SYS_ERRLIST_DECLARED
+/* if __STDC_VERSION__ >= 199901L this shouldn't be needed */
+#define inline __inline
 
 #define WM_KERBEROS5_CHANGED "Kerberos5 Changed"
 #ifdef KRB4