From: Glenn Morris <rgm@gnu.org>
Date: Wed, 1 Aug 2012 01:43:08 +0000 (-0400)
Subject: Move definitions of directory and device separators to configure
X-Git-Tag: emacs-24.2.90~940
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c0c0e8a1a3eeb60e58e9dc4b043a8db3e72ca3e;p=emacs.git

Move definitions of directory and device separators to configure

* configure.ac (DEVICE_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP):
Move here from src/lisp.h.

* src/lisp.h (IS_DIRECTORY_SEP, IS_DEVICE_SEP, IS_ANY_SEP):
Move to configure.ac.
---

diff --git a/ChangeLog b/ChangeLog
index 6c74a79f5cd..fea0e72a9df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01  Glenn Morris  <rgm@gnu.org>
+
+	* configure.ac (DEVICE_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP)
+	(IS_ANY_SEP): Move here from src/lisp.h.
+
 2012-08-01  Juanma Barranquero  <lekktu@gmail.com>
 
 	* lib/makefile.w32-in (CONFIG_H): Update dependencies.
diff --git a/configure.ac b/configure.ac
index cf4e0540d2f..27aba36e744 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3158,6 +3158,20 @@ AC_DEFINE(subprocesses, 1, [Define to enable asynchronous subprocesses.])
 AC_DEFINE(USER_FULL_NAME, [pw->pw_gecos], [How to get a user's full name.])
 
 
+dnl Only used on MS platforms.
+AH_TEMPLATE(DEVICE_SEP, [Character that separates a device in a file name.])
+
+AC_DEFINE(IS_DEVICE_SEP(_c_), 0,
+  [Returns true if character is a device separator.])
+
+AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == DIRECTORY_SEP)],
+  [Returns true if character is a directory separator.])
+
+dnl On MS, this also accepts IS_DEVICE_SEP.
+AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_))],
+  [Returns true if character is any form of separator.])
+
+
 AH_TEMPLATE(NO_EDITRES, [Define if XEditRes should not be used.])
 
 case $opsys in
diff --git a/src/ChangeLog b/src/ChangeLog
index bf172320eed..c810675c4a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01  Glenn Morris  <rgm@gnu.org>
+
+	* lisp.h (IS_DIRECTORY_SEP, IS_DEVICE_SEP, IS_ANY_SEP):
+	Move to configure.ac.
+
 2012-08-01  Juanma Barranquero  <lekktu@gmail.com>
 
 	* makefile.w32-in (CONFIG_H): Update dependencies.
diff --git a/src/lisp.h b/src/lisp.h
index 147a4781937..55f8677f9a5 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3305,24 +3305,7 @@ extern char *egetenv (const char *);
 /* Set up the name of the machine we're running on.  */
 extern void init_system_name (void);
 
-/* Some systems (e.g., NT) use a different path separator than Unix,
-   in addition to a device separator.  Set the path separator
-   to '/', and don't test for a device separator in IS_ANY_SEP.  */
-
 static char const DIRECTORY_SEP = '/';
-#ifndef IS_DIRECTORY_SEP
-#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
-#endif
-#ifndef IS_DEVICE_SEP
-#ifndef DEVICE_SEP
-#define IS_DEVICE_SEP(_c_) 0
-#else
-#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
-#endif
-#endif
-#ifndef IS_ANY_SEP
-#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
-#endif
 
 /* Use this to suppress gcc's warnings.  */
 #ifdef lint