--- a/nt/config.h	Mon Aug 13 11:19:22 2007 +0200
+++ b/nt/config.h	Mon Aug 13 11:20:41 2007 +0200
@@ -21,7 +21,7 @@
 /* Synched up with: FSF 19.30 (more or less). */
 
 /* No code in XEmacs #includes config.h twice, but some of the code
-   intended to work with other packages as well (like gmalloc.c)
+   intended to work with other packages as well (like gmalloc.c) 
    think they can include it as many times as they like.  */
 #ifndef _SRC_CONFIG_H_
 #define _SRC_CONFIG_H_
@@ -67,6 +67,12 @@
    numbers. */
 #undef LISP_FLOAT_TYPE
 
+/* Define GNU_MALLOC if you want to use the *new* GNU memory allocator. */
+#define GNU_MALLOC
+
+/* Define USE_SYSTEM_MALLOC if you forcing the use of it. */
+#undef USE_SYSTEM_MALLOC
+
 /* Define HAVE_TTY if you want TTY support compiled in. */
 #undef HAVE_TTY
 
@@ -154,10 +160,11 @@
 #undef HAVE_UTIME_H
 #undef HAVE_SYS_WAIT_H
 #undef HAVE_LIBGEN_H
+#undef HAVE_LINUX_VERSION_H
 #undef WORDS_BIGENDIAN
 #undef TIME_WITH_SYS_TIME
 
-#undef HAVE_SYS_TIME_H
+#define HAVE_SYS_TIME_H
 #define HAVE_LOCALE_H
 #ifdef HAVE_X_WINDOWS
 #define HAVE_X11_LOCALE_H
@@ -230,10 +237,7 @@
 #undef HAVE_FREXP
 #undef HAVE_FTIME
 #undef HAVE_GETHOSTNAME
-
-#define HAVE_GETPAGESIZE
-#define getpagesize() 4096
-
+#undef HAVE_GETPAGESIZE
 #define HAVE_GETTIMEOFDAY
 #define HAVE_GETWD
 #undef HAVE_LOGB
@@ -289,7 +293,7 @@
 /* Define HAVE_BERKELEY_DB if you want to use the BerkDB libraries */
 #undef HAVE_BERKELEY_DB
 /* Full #include file path for Berkeley DB's db.h */
-#undef DB_H_FILE
+#undef DB_H_PATH
 
 #if defined (HAVE_DBM) || defined (HAVE_BERKELEY_DB)
 # define HAVE_DATABASE
@@ -298,8 +302,8 @@
 /* Define HAVE_NCURSES if -lncurses is present. */
 #undef HAVE_NCURSES
 /* Full #include file paths for ncurses' curses.h and term.h. */
-#undef CURSES_H_FILE
-#undef TERM_H_FILE
+#undef CURSES_H_PATH
+#undef TERM_H_PATH
 
 #define LOWTAGS
 
@@ -332,25 +336,6 @@
 
 #endif /* DEBUG_XEMACS */
 
-/* Define convenient conditionally defined assertion macros. */
-#ifdef ERROR_CHECK_TYPECHECK
-#define type_checking_assert(assertion) assert (assertion)
-#else
-#define type_checking_assert(assertion)
-#endif
-
-#ifdef ERROR_CHECK_BUFPOS
-#define bufpos_checking_assert(assertion) assert (assertion)
-#else
-#define bufpos_checking_assert(assertion)
-#endif
-
-#ifdef ERROR_CHECK_GC
-#define gc_checking_assert(assertion) assert (assertion)
-#else
-#define gc_checking_assert(assertion)
-#endif
-
 /* Define MEMORY_USAGE_STATS if you want extra code compiled in to
    determine where XEmacs's memory is going. */
 #undef MEMORY_USAGE_STATS
@@ -427,6 +412,8 @@
    compiling-running-crashing. */
 #undef NO_DOC_FILE
 
+#define CONST const
+
 /* If not defined, use unions instead of ints.  A few systems (DEC Alpha)
    seem to require this, probably because something with the int
    definitions isn't right with 64-bit systems.
@@ -489,7 +476,7 @@
 #undef SUNPRO
 
 /* Sun SparcStations, SGI machines, and HP9000s700s have support for playing
-   different sound files as beeps.  If you are on a SparcStation but do not
+   different sound files as beeps.  If you are on a SparcStation but do not 
    have the sound option installed for some reason, then undefine
    HAVE_NATIVE_SOUND.  (It's usually found in /usr/demo/SOUND/ on SunOS 4
    and Solaris systems; on Solaris, you may need to install the "SUNWaudmo"
@@ -539,7 +526,7 @@
    uses, mbstowcs() and wcstombs(), are unusable when programs are
    statically linked (as XEmacs must be) because the static version of
    libc.a contains the *dynamic* versions of these functions.  These
-   functions don't seem to be called when XEmacs is running, so it's
+   functions don't seem to be called when XEmacs is running, so it's 
    enough to define stubs for them.
 
    This appears to be fixed in SunOS 4.1.2.
@@ -562,8 +549,10 @@
 #define ENCAPSULATE_OPEN
 #define ENCAPSULATE_FOPEN
 #define ENCAPSULATE_MKDIR
-#define ENCAPSULATE_STAT
-#define ENCAPSULATE_FSTAT
+
+#if defined (WIN32) && defined (USE_IME)
+#define HAVE_FEP
+#endif
 
 #if defined (HAVE_SOCKS) && !defined (DO_NOT_SOCKSIFY)
 #define accept Raccept
@@ -584,13 +573,11 @@
 
 /* MSVC version >= 2.x without /Za supports __inline */
 #if (_MSC_VER < 900) || defined(__STDC__)
-# define inline
+# define INLINE static
 #else
-# define inline __inline
+# define INLINE __inline
 #endif
 
-#define INLINE_HEADER inline static
-
 /* MSVC warnings no-no crap. When adding one to this section,
    1. Think twice
    2. Insert textual description of the warning.
@@ -602,21 +589,6 @@
 
 #endif /* compiler understands #pragma warning*/
 
-#ifndef NOT_C_CODE /* Actually means C or C++ */
-# if defined (__cplusplus)
-/* Avoid C++ keywords used as ordinary C identifiers */
-#  define class c_class
-#  define new   c_new
-#  define this  c_this
-#  define catch c_catch
-#  define not   c_not
-
-#  define EXTERN_C extern "C"
-# else /* C code */
-#  define EXTERN_C extern
-# endif
-#endif /* C or C++ */
-
 #define enum_field(enumeration_type) unsigned int
 
 /* We want to avoid saving the signal mask if possible, because
@@ -639,8 +611,16 @@
 /* Should movemail use hesiod for getting POP server host? */
 #undef HESIOD
 /* Determine type of mail locking. */
-#undef MAIL_LOCK_LOCKF
-#undef REAL_LOCK_FLOCK
-#undef MAIL_LOCK_DOT
+/* Play preprocessor games so that configure options override s&m files */
+#undef REAL_MAIL_USE_LOCKF
+#undef REAL_MAIL_USE_FLOCK
+#undef MAIL_USE_LOCKF
+#undef MAIL_USE_FLOCK
+#ifdef REAL_MAIL_USE_FLOCK
+#define MAIL_USE_FLOCK
+#endif
+#ifdef REAL_MAIL_USE_LOCKF
+#define MAIL_USE_LOCKF
+#endif
 
 #endif /* _SRC_CONFIG_H_ */