summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2012-08-01 13:20:07 +0200
committerJuanma Barranquero <lekktu@gmail.com>2012-08-01 13:20:07 +0200
commitc90acc54da9534fd083fc63887202f5d2ec13029 (patch)
treea5a1497185b8f4cce9e15765b451d29c88a17041 /nt
parent069bac5e5b55c0f63bd2764e727108d2b48b2643 (diff)
downloademacs-c90acc54da9534fd083fc63887202f5d2ec13029.tar.gz
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 @@
2012-08-01 Juanma Barranquero <lekktu@gmail.com>
* 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 <lekktu@gmail.com>
+
+ * config.nt: Sync with autogen/config.in.
Remove code moved to conf_post.h and include <conf_post.h>
(NULL_DEVICE, SEPCHAR, SIGNAL_H_AHB, TIOCSIGSEND, USER_FULL_NAME)
(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/>. */
/* 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 <sys/dg_sys_info.h>. */
#undef DGUX
@@ -147,6 +150,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
*/
#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 <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <inttypes.h> 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 <http://www.gnu.org/licenses/>. */
/* 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 <http://www.gnu.org/licenses/>. */
/* 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. */