aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorJuanma Barranquero2012-08-01 13:20:07 +0200
committerJuanma Barranquero2012-08-01 13:20:07 +0200
commitc90acc54da9534fd083fc63887202f5d2ec13029 (patch)
treea5a1497185b8f4cce9e15765b451d29c88a17041 /nt
parent069bac5e5b55c0f63bd2764e727108d2b48b2643 (diff)
downloademacs-c90acc54da9534fd083fc63887202f5d2ec13029.tar.gz
emacs-c90acc54da9534fd083fc63887202f5d2ec13029.zip
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.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog7
-rw-r--r--nt/config.nt25
2 files changed, 31 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5e6b3146e1d..7e97faad311 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,6 +1,13 @@
12012-08-01 Juanma Barranquero <lekktu@gmail.com> 12012-08-01 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * config.nt: Sync with autogen/config.in. 3 * config.nt: Sync with autogen/config.in.
4 (DEVICE_SEP, FLOAT_CHECK_DOMAIN, HAVE_INVERSE_HYPERBOLIC)
5 (INTERNAL_TERMINAL, IS_ANY_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP):
6 New macros.
7
82012-08-01 Juanma Barranquero <lekktu@gmail.com>
9
10 * config.nt: Sync with autogen/config.in.
4 Remove code moved to conf_post.h and include <conf_post.h> 11 Remove code moved to conf_post.h and include <conf_post.h>
5 (NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME) 12 (NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME)
6 (USG5_4, WRETCODE, _longjmp, _setjmp, wait3): New macros. 13 (USG5_4, WRETCODE, _longjmp, _setjmp, wait3): New macros.
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 <http://www.gnu.org/licenses/>. */
122/* Name of the default sound device. */ 122/* Name of the default sound device. */
123#undef DEFAULT_SOUND_DEVICE 123#undef DEFAULT_SOUND_DEVICE
124 124
125/* Character that separates a device in a file name. */
126#define DEVICE_SEP ':'
127
125/* Define to 1 for DGUX with <sys/dg_sys_info.h>. */ 128/* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
126#undef DGUX 129#undef DGUX
127 130
@@ -147,6 +150,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
147 */ 150 */
148#define FIRST_PTY_LETTER 'a' 151#define FIRST_PTY_LETTER 'a'
149 152
153/* Define if the float library doesn't handle errors by either setting errno,
154 or signaling SIGFPE/SIGILL. */
155#undef FLOAT_CHECK_DOMAIN
156
150/* Define to 1 if futimesat mishandles a NULL file name. */ 157/* Define to 1 if futimesat mishandles a NULL file name. */
151#undef FUTIMESAT_NULL_BUG 158#undef FUTIMESAT_NULL_BUG
152 159
@@ -524,6 +531,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
524/* Define to 1 if you have the <inttypes.h> header file. */ 531/* Define to 1 if you have the <inttypes.h> header file. */
525#undef HAVE_INTTYPES_H 532#undef HAVE_INTTYPES_H
526 533
534/* Define if you have the functions acosh, asinh, and atanh. */
535#undef HAVE_INVERSE_HYPERBOLIC
536
527/* Define to 1 if you have the jpeg library (-ljpeg). */ 537/* Define to 1 if you have the jpeg library (-ljpeg). */
528#undef HAVE_JPEG 538#undef HAVE_JPEG
529 539
@@ -1102,12 +1112,24 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1102/* Define if the system is HPUX. */ 1112/* Define if the system is HPUX. */
1103#undef HPUX 1113#undef HPUX
1104 1114
1115/* This is substituted when $TERM is "internal". */
1116#undef INTERNAL_TERMINAL
1117
1105/* Define to read input using SIGIO. */ 1118/* Define to read input using SIGIO. */
1106#undef INTERRUPT_INPUT 1119#undef INTERRUPT_INPUT
1107 1120
1108/* Define if the system is IRIX. */ 1121/* Define if the system is IRIX. */
1109#undef IRIX6_5 1122#undef IRIX6_5
1110 1123
1124/* Returns true if character is any form of separator. */
1125#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))
1126
1127/* Returns true if character is a device separator. */
1128#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
1129
1130/* Returns true if character is a directory separator. */
1131#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\')
1132
1111/* Define to support Kerberos-authenticated POP mail retrieval. */ 1133/* Define to support Kerberos-authenticated POP mail retrieval. */
1112#undef KERBEROS 1134#undef KERBEROS
1113 1135
@@ -1514,7 +1536,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1514/* Some platforms redefine this. */ 1536/* Some platforms redefine this. */
1515#undef _setjmp 1537#undef _setjmp
1516 1538
1517/* Define to the used os dependent file. */ 1539/* Some platforms that do not use configure define this to include extra
1540 configuration information. */
1518#define config_opsysfile "s/ms-w32.h" 1541#define config_opsysfile "s/ms-w32.h"
1519 1542
1520/* A replacement for va_copy, if needed. */ 1543/* A replacement for va_copy, if needed. */