diff options
| author | Juanma Barranquero | 2013-03-15 18:12:03 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2013-03-15 18:12:03 +0100 |
| commit | 5a96718d7947eb32724581f4c08ad37674ae233c (patch) | |
| tree | 61cab8b967b602ab5287d50ba4d781c4bfc31f6c /nt | |
| parent | 646859d33a8ede0cbb3e1685a313420b6510c9c1 (diff) | |
| download | emacs-5a96718d7947eb32724581f4c08ad37674ae233c.tar.gz emacs-5a96718d7947eb32724581f4c08ad37674ae233c.zip | |
nt/config.nt: Sync with autogen/config.in.
(BSD_SYSTEM, BSD_SYSTEM_AHB, HAVE_ALARM, HAVE__PUTENV): Remove.
(HAVE_DECL_ALARM, HAVE_DECL_FDATASYNC, HAVE_DECL__PUTENV)
(HAVE_FDATASYNC): New macros.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 7 | ||||
| -rw-r--r-- | nt/config.nt | 27 |
2 files changed, 22 insertions, 12 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 48c1cb8bc82..f437b7433d2 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-03-15 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * config.nt: Sync with autogen/config.in. | ||
| 4 | (BSD_SYSTEM, BSD_SYSTEM_AHB, HAVE_ALARM, HAVE__PUTENV): Remove. | ||
| 5 | (HAVE_DECL_ALARM, HAVE_DECL_FDATASYNC, HAVE_DECL__PUTENV) | ||
| 6 | (HAVE_FDATASYNC): New macros. | ||
| 7 | |||
| 1 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> | 8 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 9 | ||
| 3 | File synchronization fixes (Bug#13944). | 10 | File synchronization fixes (Bug#13944). |
diff --git a/nt/config.nt b/nt/config.nt index 547bb68d80f..1fe707cce2d 100644 --- a/nt/config.nt +++ b/nt/config.nt | |||
| @@ -60,12 +60,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 60 | /* Define on FreeBSD to work around an issue when reading from a PTY. */ | 60 | /* Define on FreeBSD to work around an issue when reading from a PTY. */ |
| 61 | #undef BROKEN_PTY_READ_AFTER_EAGAIN | 61 | #undef BROKEN_PTY_READ_AFTER_EAGAIN |
| 62 | 62 | ||
| 63 | /* Define if the system is compatible with BSD 4.2. */ | ||
| 64 | #undef BSD_SYSTEM | ||
| 65 | |||
| 66 | /* Define if AH_BOTTOM should change BSD_SYSTEM. */ | ||
| 67 | #undef BSD_SYSTEM_AHB | ||
| 68 | |||
| 69 | /* Define if Emacs cannot be dumped on your system. */ | 63 | /* Define if Emacs cannot be dumped on your system. */ |
| 70 | #undef CANNOT_DUMP | 64 | #undef CANNOT_DUMP |
| 71 | 65 | ||
| @@ -224,9 +218,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 224 | /* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */ | 218 | /* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */ |
| 225 | #undef HAVE_AIX_SMT_EXP | 219 | #undef HAVE_AIX_SMT_EXP |
| 226 | 220 | ||
| 227 | /* Define to 1 if you have the `alarm' function. */ | ||
| 228 | #undef HAVE_ALARM | ||
| 229 | |||
| 230 | /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that | 221 | /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that |
| 231 | may be supplied by this distribution. */ | 222 | may be supplied by this distribution. */ |
| 232 | #undef HAVE_ALLOCA | 223 | #undef HAVE_ALLOCA |
| @@ -287,6 +278,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 287 | /* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */ | 278 | /* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */ |
| 288 | #undef HAVE_DBUS_WATCH_GET_UNIX_FD | 279 | #undef HAVE_DBUS_WATCH_GET_UNIX_FD |
| 289 | 280 | ||
| 281 | /* Define to 1 if you have the declaration of `alarm', and to 0 if you don't. | ||
| 282 | */ | ||
| 283 | #undef HAVE_DECL_ALARM | ||
| 284 | |||
| 285 | /* Define to 1 if you have the declaration of `fdatasync', and to 0 if you | ||
| 286 | don't. */ | ||
| 287 | #undef HAVE_DECL_FDATASYNC | ||
| 288 | |||
| 290 | /* Define to 1 if you have the declaration of `fdopendir', and to 0 if you | 289 | /* Define to 1 if you have the declaration of `fdopendir', and to 0 if you |
| 291 | don't. */ | 290 | don't. */ |
| 292 | #undef HAVE_DECL_FDOPENDIR | 291 | #undef HAVE_DECL_FDOPENDIR |
| @@ -335,6 +334,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 335 | don't. */ | 334 | don't. */ |
| 336 | #undef HAVE_DECL_UNSETENV | 335 | #undef HAVE_DECL_UNSETENV |
| 337 | 336 | ||
| 337 | /* Define to 1 if you have the declaration of `_putenv', and to 0 if you | ||
| 338 | don't. */ | ||
| 339 | #undef HAVE_DECL__PUTENV | ||
| 340 | |||
| 338 | /* Define to 1 if you have the declaration of `__fpending', and to 0 if you | 341 | /* Define to 1 if you have the declaration of `__fpending', and to 0 if you |
| 339 | don't. */ | 342 | don't. */ |
| 340 | #undef HAVE_DECL___FPENDING | 343 | #undef HAVE_DECL___FPENDING |
| @@ -379,6 +382,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 379 | /* Define to 1 if you have the `faccessat' function. */ | 382 | /* Define to 1 if you have the `faccessat' function. */ |
| 380 | #undef HAVE_FACCESSAT | 383 | #undef HAVE_FACCESSAT |
| 381 | 384 | ||
| 385 | /* Define to 1 if you have the `fdatasync' function. */ | ||
| 386 | #undef HAVE_FDATASYNC | ||
| 387 | |||
| 382 | /* Define to 1 if you have the `fdopendir' function. */ | 388 | /* Define to 1 if you have the `fdopendir' function. */ |
| 383 | #undef HAVE_FDOPENDIR | 389 | #undef HAVE_FDOPENDIR |
| 384 | 390 | ||
| @@ -1137,9 +1143,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1137 | /* Define to 1 if you have the `_ftime' function. */ | 1143 | /* Define to 1 if you have the `_ftime' function. */ |
| 1138 | #undef HAVE__FTIME | 1144 | #undef HAVE__FTIME |
| 1139 | 1145 | ||
| 1140 | /* Define to 1 if you have the `_putenv' function. */ | ||
| 1141 | #undef HAVE__PUTENV | ||
| 1142 | |||
| 1143 | /* Define to 1 if _setjmp and _longjmp work. */ | 1146 | /* Define to 1 if _setjmp and _longjmp work. */ |
| 1144 | #define HAVE__SETJMP 1 | 1147 | #define HAVE__SETJMP 1 |
| 1145 | 1148 | ||