--- a/src/config.h.in	Mon Aug 13 11:15:00 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 11:16:07 2007 +0200
@@ -38,7 +38,7 @@
 #elif defined(_AIX)
 #pragma alloca
 #elif ! defined (alloca)
-char *alloca();
+char *alloca ();
 #endif
 #endif /* C code */
 
@@ -47,6 +47,9 @@
    files so as to make it obvious where XEmacs changes are. */
 #define XEMACS 1
 
+/* Program name */
+#undef EMACS_PROGNAME
+
 /* Allow s&m files to differentiate OS versions without having
    multiple files to maintain. */
 #undef OS_RELEASE
@@ -390,6 +393,11 @@
 /* Does the library define ldap_parse_result () ? */
 #undef HAVE_LDAP_PARSE_RESULT
 
+/* Do we wish to link against the PostgreSQL RDBMS run-time library?
+ */
+#undef HAVE_POSTGRESQL
+#undef HAVE_POSTGRESQLV7
+
 /* Do you have the Xauth library present?  This will add some extra
    functionality to gnuserv. */
 #undef HAVE_XAUTH
@@ -775,30 +783,20 @@
 #define LONG_LONG_BITS (SIZEOF_LONG_LONG * BITS_PER_CHAR)
 #define VOID_P_BITS (SIZEOF_VOID_P * BITS_PER_CHAR)
 
-#ifndef NOT_C_CODE
-#ifdef __cplusplus
-#define HAVE_INLINE 1
-#define INLINE inline
-#else /* not C++ */
+/* Use `INLINE_HEADER' to define inline functions in .h files.
+   Use `inline static' to define inline functions in .c files.
+   See the Internals manual for examples and more information. */
+
 /* Does the keyword `inline' exist?  */
-#undef HAVE_INLINE
 #undef inline
 
-# ifdef HAVE_INLINE
-#  ifdef __GNUC__
-#   ifdef DONT_EXTERN_INLINE_FUNCTIONS
-#    define INLINE inline
-#   else
-#    define INLINE extern inline
-#   endif
-#  else
-#   define INLINE static inline
-#  endif /* __GNUC__ */
-# else
-#  define INLINE static
-# endif /* HAVE_INLINE */
-#endif /* not C++ */
-#endif /* C code */
+#if defined (__cplusplus) || ! defined (__GNUC__)
+# define INLINE_HEADER inline static
+#elif defined (DONT_EXTERN_INLINE_HEADER_FUNCTIONS)
+# define INLINE_HEADER inline
+#else
+# define INLINE_HEADER inline extern
+#endif
 
 #if defined (__cplusplus) && !defined (NOT_C_CODE)
 /* Avoid C++ keywords used as ordinary C identifiers */