From ae18dc22e483d35d042edf4716d87a338d2489c5 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 13 Feb 2013 01:52:04 +0100 Subject: [PATCH] nt/config.nt: Sync with autogen/config.in. (GC_MARK_STACK): Remove. (GNULIB_FDOPENDIR, HAVE_DECL_FDOPENDIR, HAVE_DECL_MEMRCHR) (HAVE_DIRENT_H, HAVE_FDOPENDIR, HAVE_FSTATAT, HAVE_MEMRCHR) (HAVE_WORKING_FSTATAT_ZERO_FLAG, _NETBSD_SOURCE): New macros. --- nt/ChangeLog | 8 +++++ nt/config.nt | 102 +++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 73 insertions(+), 37 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 1d3f7b7f49f..18911b90fac 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,11 @@ +2013-02-13 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (GC_MARK_STACK): Remove. + (GNULIB_FDOPENDIR, HAVE_DECL_FDOPENDIR, HAVE_DECL_MEMRCHR) + (HAVE_DIRENT_H, HAVE_FDOPENDIR, HAVE_FSTATAT, HAVE_MEMRCHR) + (HAVE_WORKING_FSTATAT_ZERO_FLAG, _NETBSD_SOURCE): New macros. + 2013-02-12 Eli Zaretskii * inc/ms-w32.h: Add prototype for memrchr. diff --git a/nt/config.nt b/nt/config.nt index 2a8c54baa47..61e56174bb4 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -164,10 +164,6 @@ along with GNU Emacs. If not, see . */ /* Mark a secondary stack, like the register stack on the ia64. */ #undef GC_MARK_SECONDARY_STACK -/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not - known to work. */ -#define GC_MARK_STACK 1 - /* Define if setjmp is known to save all registers relevant for conservative garbage collection in the jmp_buf. MSVC ignores the "register" keyword, so test fails even though @@ -201,6 +197,10 @@ along with GNU Emacs. If not, see . */ #undef GNULIB_FACCESSAT /* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module fdopendir shall be considered present. */ +#undef GNULIB_FDOPENDIR + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module fscanf shall be considered present. */ #undef GNULIB_FSCANF @@ -286,6 +286,10 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */ #undef HAVE_DBUS_WATCH_GET_UNIX_FD +/* Define to 1 if you have the declaration of `fdopendir', and to 0 if you + don't. */ +#undef HAVE_DECL_FDOPENDIR + /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. */ #define HAVE_DECL_GETENV 1 @@ -294,6 +298,10 @@ along with GNU Emacs. If not, see . */ don't. */ #undef HAVE_DECL_LOCALTIME_R +/* Define to 1 if you have the declaration of `memrchr', and to 0 if you + don't. */ +#undef HAVE_DECL_MEMRCHR + /* Define to 1 if you have the declaration of `strmode', and to 0 if you don't. */ #undef HAVE_DECL_STRMODE @@ -343,6 +351,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `difftime' function. */ #undef HAVE_DIFFTIME +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H + /* Define to 1 if you have the 'dup2' function. */ #define HAVE_DUP2 1 @@ -367,6 +378,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `faccessat' function. */ #undef HAVE_FACCESSAT +/* Define to 1 if you have the `fdopendir' function. */ +#undef HAVE_FDOPENDIR + /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -379,6 +393,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO +/* Define to 1 if you have the `fstatat' function. */ +#undef HAVE_FSTATAT + /* Define to 1 if you have the `fsync' function. */ #define HAVE_FSYNC 1 @@ -686,6 +703,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the `memrchr' function. */ +#undef HAVE_MEMRCHR + /* Define to 1 if you have mouse menus. (This is automatic if you use X, but the option to specify it remains.) It is also defined with other window systems that support xmenu.c. */ @@ -1051,6 +1071,10 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if `fork' works. */ #undef HAVE_WORKING_FORK +/* Define to 1 if fstatat (..., 0) works. For example, it does not work in AIX + 7.1. */ +#undef HAVE_WORKING_FSTATAT_ZERO_FLAG + /* Define if utimes works properly. */ #undef HAVE_WORKING_UTIMES @@ -1388,6 +1412,38 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if using the Motif X toolkit. */ #undef USE_MOTIF +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on OS X. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions if necessary. HP-UX 11.11 defines + mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of + whether compiling with -Ae or -D_HPUX_SOURCE=1. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Define to 1 if we should use toolkit scroll bars. */ #define USE_TOOLKIT_SCROLL_BARS 1 @@ -1452,10 +1508,8 @@ along with GNU Emacs. If not, see . */ /* Define if the system is AIX. */ #undef _AIX -/* Enable large inode numbers on Mac OS X. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif +/* Enable large inode numbers on Mac OS X 10.5. */ +#undef _DARWIN_USE_64_BIT_INODE /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS @@ -1476,6 +1530,9 @@ along with GNU Emacs. If not, see . */ /* Define if GNUstep uses ObjC exceptions. */ #undef _NATIVE_OBJC_EXCEPTIONS +/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */ +#undef _NETBSD_SOURCE + /* The _Noreturn keyword of C11. */ #if ! (defined _Noreturn \ || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) @@ -1499,35 +1556,6 @@ along with GNU Emacs. If not, see . */ /* Needed for system_process_attributes on Solaris. */ #undef _STRUCTURED_PROC -/* Define to 500 only on HP-UX. */ -#undef _XOPEN_SOURCE - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable general extensions on Mac OS X. */ -#ifndef _DARWIN_C_SOURCE -# undef _DARWIN_C_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - /* Define to rpl_ if the getopt replacement functions and variables should be used. */ #undef __GETOPT_PREFIX -- 2.11.4.GIT