--- a/src/config.h.in	Mon Aug 13 09:38:27 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 09:39:39 2007 +0200
@@ -158,9 +158,6 @@
 /* Can `gettimeofday' accept two arguments? */
 #undef GETTIMEOFDAY_ONE_ARGUMENT
 
-/* Does the keyword `inline' exist? */
-#undef HAVE_INLINE
-
 #undef HAVE_MMAP
 #undef HAVE_STRCOLL
 
@@ -639,19 +636,23 @@
 #define LONGBITS (8 * SIZEOF_LONG)
 #endif
 
+/* Does the keyword `inline' exist?  */
+#undef HAVE_INLINE
+#undef inline
+
 #ifdef HAVE_INLINE
-# if defined (__GNUC__)
-#  if defined (DONT_EXTERN_INLINE_FUNCTIONS)
+# ifdef __GNUC__
+#  ifdef DONT_EXTERN_INLINE_FUNCTIONS
 #   define INLINE inline
 #  else
 #   define INLINE extern inline
 #  endif
 # else
 #  define INLINE static inline
-# endif
+# endif /* __GNUC__ */
 #else
 # define INLINE static
-#endif
+#endif /* HAVE_INLINE */
 
 /* We want to avoid saving the signal mask if possible, because
    that necessitates a system call. */