diff options
| author | Juanma Barranquero | 2013-02-13 01:52:04 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2013-02-13 01:52:04 +0100 |
| commit | ae18dc22e483d35d042edf4716d87a338d2489c5 (patch) | |
| tree | 66b61b978c0ce47eae0ebbf19a588ba34466e4b5 | |
| parent | 45b2b76861220779a9ea2096a39c9bc18352517d (diff) | |
| download | emacs-ae18dc22e483d35d042edf4716d87a338d2489c5.tar.gz emacs-ae18dc22e483d35d042edf4716d87a338d2489c5.zip | |
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.
| -rw-r--r-- | nt/ChangeLog | 8 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-02-13 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * config.nt: Sync with autogen/config.in. | ||
| 4 | (GC_MARK_STACK): Remove. | ||
| 5 | (GNULIB_FDOPENDIR, HAVE_DECL_FDOPENDIR, HAVE_DECL_MEMRCHR) | ||
| 6 | (HAVE_DIRENT_H, HAVE_FDOPENDIR, HAVE_FSTATAT, HAVE_MEMRCHR) | ||
| 7 | (HAVE_WORKING_FSTATAT_ZERO_FLAG, _NETBSD_SOURCE): New macros. | ||
| 8 | |||
| 1 | 2013-02-12 Eli Zaretskii <eliz@gnu.org> | 9 | 2013-02-12 Eli Zaretskii <eliz@gnu.org> |
| 2 | 10 | ||
| 3 | * inc/ms-w32.h: Add prototype for memrchr. | 11 | * 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 <http://www.gnu.org/licenses/>. */ | |||
| 164 | /* Mark a secondary stack, like the register stack on the ia64. */ | 164 | /* Mark a secondary stack, like the register stack on the ia64. */ |
| 165 | #undef GC_MARK_SECONDARY_STACK | 165 | #undef GC_MARK_SECONDARY_STACK |
| 166 | 166 | ||
| 167 | /* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not | ||
| 168 | known to work. */ | ||
| 169 | #define GC_MARK_STACK 1 | ||
| 170 | |||
| 171 | /* Define if setjmp is known to save all registers relevant for conservative | 167 | /* Define if setjmp is known to save all registers relevant for conservative |
| 172 | garbage collection in the jmp_buf. | 168 | garbage collection in the jmp_buf. |
| 173 | MSVC ignores the "register" keyword, so test fails even though | 169 | MSVC ignores the "register" keyword, so test fails even though |
| @@ -201,6 +197,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 201 | #undef GNULIB_FACCESSAT | 197 | #undef GNULIB_FACCESSAT |
| 202 | 198 | ||
| 203 | /* Define to a C preprocessor expression that evaluates to 1 or 0, depending | 199 | /* Define to a C preprocessor expression that evaluates to 1 or 0, depending |
| 200 | whether the gnulib module fdopendir shall be considered present. */ | ||
| 201 | #undef GNULIB_FDOPENDIR | ||
| 202 | |||
| 203 | /* Define to a C preprocessor expression that evaluates to 1 or 0, depending | ||
| 204 | whether the gnulib module fscanf shall be considered present. */ | 204 | whether the gnulib module fscanf shall be considered present. */ |
| 205 | #undef GNULIB_FSCANF | 205 | #undef GNULIB_FSCANF |
| 206 | 206 | ||
| @@ -286,6 +286,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 286 | /* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */ | 286 | /* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */ |
| 287 | #undef HAVE_DBUS_WATCH_GET_UNIX_FD | 287 | #undef HAVE_DBUS_WATCH_GET_UNIX_FD |
| 288 | 288 | ||
| 289 | /* Define to 1 if you have the declaration of `fdopendir', and to 0 if you | ||
| 290 | don't. */ | ||
| 291 | #undef HAVE_DECL_FDOPENDIR | ||
| 292 | |||
| 289 | /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. | 293 | /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. |
| 290 | */ | 294 | */ |
| 291 | #define HAVE_DECL_GETENV 1 | 295 | #define HAVE_DECL_GETENV 1 |
| @@ -294,6 +298,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 294 | don't. */ | 298 | don't. */ |
| 295 | #undef HAVE_DECL_LOCALTIME_R | 299 | #undef HAVE_DECL_LOCALTIME_R |
| 296 | 300 | ||
| 301 | /* Define to 1 if you have the declaration of `memrchr', and to 0 if you | ||
| 302 | don't. */ | ||
| 303 | #undef HAVE_DECL_MEMRCHR | ||
| 304 | |||
| 297 | /* Define to 1 if you have the declaration of `strmode', and to 0 if you | 305 | /* Define to 1 if you have the declaration of `strmode', and to 0 if you |
| 298 | don't. */ | 306 | don't. */ |
| 299 | #undef HAVE_DECL_STRMODE | 307 | #undef HAVE_DECL_STRMODE |
| @@ -343,6 +351,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 343 | /* Define to 1 if you have the `difftime' function. */ | 351 | /* Define to 1 if you have the `difftime' function. */ |
| 344 | #undef HAVE_DIFFTIME | 352 | #undef HAVE_DIFFTIME |
| 345 | 353 | ||
| 354 | /* Define to 1 if you have the <dirent.h> header file. */ | ||
| 355 | #undef HAVE_DIRENT_H | ||
| 356 | |||
| 346 | /* Define to 1 if you have the 'dup2' function. */ | 357 | /* Define to 1 if you have the 'dup2' function. */ |
| 347 | #define HAVE_DUP2 1 | 358 | #define HAVE_DUP2 1 |
| 348 | 359 | ||
| @@ -367,6 +378,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 367 | /* Define to 1 if you have the `faccessat' function. */ | 378 | /* Define to 1 if you have the `faccessat' function. */ |
| 368 | #undef HAVE_FACCESSAT | 379 | #undef HAVE_FACCESSAT |
| 369 | 380 | ||
| 381 | /* Define to 1 if you have the `fdopendir' function. */ | ||
| 382 | #undef HAVE_FDOPENDIR | ||
| 383 | |||
| 370 | /* Define to 1 if you have the `fork' function. */ | 384 | /* Define to 1 if you have the `fork' function. */ |
| 371 | #undef HAVE_FORK | 385 | #undef HAVE_FORK |
| 372 | 386 | ||
| @@ -379,6 +393,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 379 | /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ | 393 | /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ |
| 380 | #undef HAVE_FSEEKO | 394 | #undef HAVE_FSEEKO |
| 381 | 395 | ||
| 396 | /* Define to 1 if you have the `fstatat' function. */ | ||
| 397 | #undef HAVE_FSTATAT | ||
| 398 | |||
| 382 | /* Define to 1 if you have the `fsync' function. */ | 399 | /* Define to 1 if you have the `fsync' function. */ |
| 383 | #define HAVE_FSYNC 1 | 400 | #define HAVE_FSYNC 1 |
| 384 | 401 | ||
| @@ -686,6 +703,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 686 | /* Define to 1 if you have the <memory.h> header file. */ | 703 | /* Define to 1 if you have the <memory.h> header file. */ |
| 687 | #undef HAVE_MEMORY_H | 704 | #undef HAVE_MEMORY_H |
| 688 | 705 | ||
| 706 | /* Define to 1 if you have the `memrchr' function. */ | ||
| 707 | #undef HAVE_MEMRCHR | ||
| 708 | |||
| 689 | /* Define to 1 if you have mouse menus. (This is automatic if you use X, but | 709 | /* Define to 1 if you have mouse menus. (This is automatic if you use X, but |
| 690 | the option to specify it remains.) It is also defined with other window | 710 | the option to specify it remains.) It is also defined with other window |
| 691 | systems that support xmenu.c. */ | 711 | systems that support xmenu.c. */ |
| @@ -1051,6 +1071,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1051 | /* Define to 1 if `fork' works. */ | 1071 | /* Define to 1 if `fork' works. */ |
| 1052 | #undef HAVE_WORKING_FORK | 1072 | #undef HAVE_WORKING_FORK |
| 1053 | 1073 | ||
| 1074 | /* Define to 1 if fstatat (..., 0) works. For example, it does not work in AIX | ||
| 1075 | 7.1. */ | ||
| 1076 | #undef HAVE_WORKING_FSTATAT_ZERO_FLAG | ||
| 1077 | |||
| 1054 | /* Define if utimes works properly. */ | 1078 | /* Define if utimes works properly. */ |
| 1055 | #undef HAVE_WORKING_UTIMES | 1079 | #undef HAVE_WORKING_UTIMES |
| 1056 | 1080 | ||
| @@ -1388,6 +1412,38 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1388 | /* Define to 1 if using the Motif X toolkit. */ | 1412 | /* Define to 1 if using the Motif X toolkit. */ |
| 1389 | #undef USE_MOTIF | 1413 | #undef USE_MOTIF |
| 1390 | 1414 | ||
| 1415 | /* Enable extensions on AIX 3, Interix. */ | ||
| 1416 | #ifndef _ALL_SOURCE | ||
| 1417 | # undef _ALL_SOURCE | ||
| 1418 | #endif | ||
| 1419 | /* Enable general extensions on OS X. */ | ||
| 1420 | #ifndef _DARWIN_C_SOURCE | ||
| 1421 | # undef _DARWIN_C_SOURCE | ||
| 1422 | #endif | ||
| 1423 | /* Enable GNU extensions on systems that have them. */ | ||
| 1424 | #ifndef _GNU_SOURCE | ||
| 1425 | # undef _GNU_SOURCE | ||
| 1426 | #endif | ||
| 1427 | /* Enable threading extensions on Solaris. */ | ||
| 1428 | #ifndef _POSIX_PTHREAD_SEMANTICS | ||
| 1429 | # undef _POSIX_PTHREAD_SEMANTICS | ||
| 1430 | #endif | ||
| 1431 | /* Enable extensions on HP NonStop. */ | ||
| 1432 | #ifndef _TANDEM_SOURCE | ||
| 1433 | # undef _TANDEM_SOURCE | ||
| 1434 | #endif | ||
| 1435 | /* Enable X/Open extensions if necessary. HP-UX 11.11 defines | ||
| 1436 | mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of | ||
| 1437 | whether compiling with -Ae or -D_HPUX_SOURCE=1. */ | ||
| 1438 | #ifndef _XOPEN_SOURCE | ||
| 1439 | # undef _XOPEN_SOURCE | ||
| 1440 | #endif | ||
| 1441 | /* Enable general extensions on Solaris. */ | ||
| 1442 | #ifndef __EXTENSIONS__ | ||
| 1443 | # undef __EXTENSIONS__ | ||
| 1444 | #endif | ||
| 1445 | |||
| 1446 | |||
| 1391 | /* Define to 1 if we should use toolkit scroll bars. */ | 1447 | /* Define to 1 if we should use toolkit scroll bars. */ |
| 1392 | #define USE_TOOLKIT_SCROLL_BARS 1 | 1448 | #define USE_TOOLKIT_SCROLL_BARS 1 |
| 1393 | 1449 | ||
| @@ -1452,10 +1508,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1452 | /* Define if the system is AIX. */ | 1508 | /* Define if the system is AIX. */ |
| 1453 | #undef _AIX | 1509 | #undef _AIX |
| 1454 | 1510 | ||
| 1455 | /* Enable large inode numbers on Mac OS X. */ | 1511 | /* Enable large inode numbers on Mac OS X 10.5. */ |
| 1456 | #ifndef _DARWIN_USE_64_BIT_INODE | 1512 | #undef _DARWIN_USE_64_BIT_INODE |
| 1457 | # define _DARWIN_USE_64_BIT_INODE 1 | ||
| 1458 | #endif | ||
| 1459 | 1513 | ||
| 1460 | /* Number of bits in a file offset, on hosts where this is settable. */ | 1514 | /* Number of bits in a file offset, on hosts where this is settable. */ |
| 1461 | #undef _FILE_OFFSET_BITS | 1515 | #undef _FILE_OFFSET_BITS |
| @@ -1476,6 +1530,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1476 | /* Define if GNUstep uses ObjC exceptions. */ | 1530 | /* Define if GNUstep uses ObjC exceptions. */ |
| 1477 | #undef _NATIVE_OBJC_EXCEPTIONS | 1531 | #undef _NATIVE_OBJC_EXCEPTIONS |
| 1478 | 1532 | ||
| 1533 | /* Define to 1 to make NetBSD features available. MINIX 3 needs this. */ | ||
| 1534 | #undef _NETBSD_SOURCE | ||
| 1535 | |||
| 1479 | /* The _Noreturn keyword of C11. */ | 1536 | /* The _Noreturn keyword of C11. */ |
| 1480 | #if ! (defined _Noreturn \ | 1537 | #if ! (defined _Noreturn \ |
| 1481 | || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) | 1538 | || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) |
| @@ -1499,35 +1556,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1499 | /* Needed for system_process_attributes on Solaris. */ | 1556 | /* Needed for system_process_attributes on Solaris. */ |
| 1500 | #undef _STRUCTURED_PROC | 1557 | #undef _STRUCTURED_PROC |
| 1501 | 1558 | ||
| 1502 | /* Define to 500 only on HP-UX. */ | ||
| 1503 | #undef _XOPEN_SOURCE | ||
| 1504 | |||
| 1505 | /* Enable extensions on AIX 3, Interix. */ | ||
| 1506 | #ifndef _ALL_SOURCE | ||
| 1507 | # undef _ALL_SOURCE | ||
| 1508 | #endif | ||
| 1509 | /* Enable general extensions on Mac OS X. */ | ||
| 1510 | #ifndef _DARWIN_C_SOURCE | ||
| 1511 | # undef _DARWIN_C_SOURCE | ||
| 1512 | #endif | ||
| 1513 | /* Enable GNU extensions on systems that have them. */ | ||
| 1514 | #ifndef _GNU_SOURCE | ||
| 1515 | # undef _GNU_SOURCE | ||
| 1516 | #endif | ||
| 1517 | /* Enable threading extensions on Solaris. */ | ||
| 1518 | #ifndef _POSIX_PTHREAD_SEMANTICS | ||
| 1519 | # undef _POSIX_PTHREAD_SEMANTICS | ||
| 1520 | #endif | ||
| 1521 | /* Enable extensions on HP NonStop. */ | ||
| 1522 | #ifndef _TANDEM_SOURCE | ||
| 1523 | # undef _TANDEM_SOURCE | ||
| 1524 | #endif | ||
| 1525 | /* Enable general extensions on Solaris. */ | ||
| 1526 | #ifndef __EXTENSIONS__ | ||
| 1527 | # undef __EXTENSIONS__ | ||
| 1528 | #endif | ||
| 1529 | |||
| 1530 | |||
| 1531 | /* Define to rpl_ if the getopt replacement functions and variables should be | 1559 | /* Define to rpl_ if the getopt replacement functions and variables should be |
| 1532 | used. */ | 1560 | used. */ |
| 1533 | #undef __GETOPT_PREFIX | 1561 | #undef __GETOPT_PREFIX |