From c90acc54da9534fd083fc63887202f5d2ec13029 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 1 Aug 2012 13:20:07 +0200 Subject: [PATCH] Sync Windows port with autogen/config.in changes. * nt/config.nt: Sync with autogen/config.in. (DEVICE_SEP, FLOAT_CHECK_DOMAIN, HAVE_INVERSE_HYPERBOLIC) (INTERNAL_TERMINAL, IS_ANY_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP): New macros. * src/s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP): Remove; moved to nt/config.nt. --- nt/ChangeLog | 7 +++++++ nt/config.nt | 25 ++++++++++++++++++++++++- src/ChangeLog | 5 +++++ src/s/ms-w32.h | 7 ------- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 5e6b3146e1d..7e97faad311 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,10 @@ +2012-08-01 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (DEVICE_SEP, FLOAT_CHECK_DOMAIN, HAVE_INVERSE_HYPERBOLIC) + (INTERNAL_TERMINAL, IS_ANY_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP): + New macros. + 2012-08-01 Juanma Barranquero * config.nt: Sync with autogen/config.in. diff --git a/nt/config.nt b/nt/config.nt index 37d0009c750..97889438cc6 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -122,6 +122,9 @@ along with GNU Emacs. If not, see . */ /* Name of the default sound device. */ #undef DEFAULT_SOUND_DEVICE +/* Character that separates a device in a file name. */ +#define DEVICE_SEP ':' + /* Define to 1 for DGUX with . */ #undef DGUX @@ -147,6 +150,10 @@ along with GNU Emacs. If not, see . */ */ #define FIRST_PTY_LETTER 'a' +/* Define if the float library doesn't handle errors by either setting errno, + or signaling SIGFPE/SIGILL. */ +#undef FLOAT_CHECK_DOMAIN + /* Define to 1 if futimesat mishandles a NULL file name. */ #undef FUTIMESAT_NULL_BUG @@ -524,6 +531,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if you have the functions acosh, asinh, and atanh. */ +#undef HAVE_INVERSE_HYPERBOLIC + /* Define to 1 if you have the jpeg library (-ljpeg). */ #undef HAVE_JPEG @@ -1102,12 +1112,24 @@ along with GNU Emacs. If not, see . */ /* Define if the system is HPUX. */ #undef HPUX +/* This is substituted when $TERM is "internal". */ +#undef INTERNAL_TERMINAL + /* Define to read input using SIGIO. */ #undef INTERRUPT_INPUT /* Define if the system is IRIX. */ #undef IRIX6_5 +/* Returns true if character is any form of separator. */ +#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) + +/* Returns true if character is a device separator. */ +#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP) + +/* Returns true if character is a directory separator. */ +#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') + /* Define to support Kerberos-authenticated POP mail retrieval. */ #undef KERBEROS @@ -1514,7 +1536,8 @@ along with GNU Emacs. If not, see . */ /* Some platforms redefine this. */ #undef _setjmp -/* Define to the used os dependent file. */ +/* Some platforms that do not use configure define this to include extra + configuration information. */ #define config_opsysfile "s/ms-w32.h" /* A replacement for va_copy, if needed. */ diff --git a/src/ChangeLog b/src/ChangeLog index a6913d1ad78..97e4d71baab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-08-01 Juanma Barranquero + + * s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP): + Remove; moved to nt/config.nt. + 2012-08-01 Dmitry Antipov Use INTERNAL_FIELD for conses and overlays. diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index ca4c1001ec9..8c02a8b8a66 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -74,13 +74,6 @@ along with GNU Emacs. If not, see . */ your system and must be used only through an encapsulation (which you should place, by convention, in sysdep.c). */ -/* Define this to be the separator between devices and paths. */ -#define DEVICE_SEP ':' - -/* We'll support either convention on NT. */ -#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') -#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) - #ifdef __GNUC__ #ifndef __cplusplus #undef inline