diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-07-01 19:39:39 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-07-01 19:39:39 +0000 |
| commit | 22f8ba51ee2c7a26315053a5d42a5bacd9799c5c (patch) | |
| tree | 42109a4d0ae72d59c3774f53043eef670809f57e /src | |
| parent | 005a5f45a7663d311192d69afe719f1c7765b4d9 (diff) | |
| download | krb5-22f8ba51ee2c7a26315053a5d42a5bacd9799c5c.tar.gz krb5-22f8ba51ee2c7a26315053a5d42a5bacd9799c5c.tar.xz krb5-22f8ba51ee2c7a26315053a5d42a5bacd9799c5c.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/configure.in | 2 | ||||
| -rw-r--r-- | src/include/k5-platform.h | 17 | ||||
| -rw-r--r-- | src/include/win-mac.h | 2 |
4 files changed, 10 insertions, 17 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index cf201aa71c..00c437d797 100644 --- 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 818398185c..b3dbb2ac1d 100644 --- 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 f0966f9831..bf8a584322 100644 --- 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 8811dbd58c..ece6e126c4 100644 --- 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 |