aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-07-31 21:43:08 -0400
committerGlenn Morris2012-07-31 21:43:08 -0400
commit5c0c0e8a1a3eeb60e58e9dc4b043a8db3e72ca3e (patch)
treeba7f87ad74ff21e06e5c17cffcfacfefe4b68113 /src
parent552a99b4cb5474337048053c2e7f0dd9eef9b1cb (diff)
downloademacs-5c0c0e8a1a3eeb60e58e9dc4b043a8db3e72ca3e.tar.gz
emacs-5c0c0e8a1a3eeb60e58e9dc4b043a8db3e72ca3e.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/lisp.h17
2 files changed, 5 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bf172320eed..c810675c4a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-08-01 Glenn Morris <rgm@gnu.org>
2
3 * lisp.h (IS_DIRECTORY_SEP, IS_DEVICE_SEP, IS_ANY_SEP):
4 Move to configure.ac.
5
12012-08-01 Juanma Barranquero <lekktu@gmail.com> 62012-08-01 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * makefile.w32-in (CONFIG_H): Update dependencies. 8 * 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 *);
3305/* Set up the name of the machine we're running on. */ 3305/* Set up the name of the machine we're running on. */
3306extern void init_system_name (void); 3306extern void init_system_name (void);
3307 3307
3308/* Some systems (e.g., NT) use a different path separator than Unix,
3309 in addition to a device separator. Set the path separator
3310 to '/', and don't test for a device separator in IS_ANY_SEP. */
3311
3312static char const DIRECTORY_SEP = '/'; 3308static char const DIRECTORY_SEP = '/';
3313#ifndef IS_DIRECTORY_SEP
3314#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
3315#endif
3316#ifndef IS_DEVICE_SEP
3317#ifndef DEVICE_SEP
3318#define IS_DEVICE_SEP(_c_) 0
3319#else
3320#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
3321#endif
3322#endif
3323#ifndef IS_ANY_SEP
3324#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
3325#endif
3326 3309
3327/* Use this to suppress gcc's warnings. */ 3310/* Use this to suppress gcc's warnings. */
3328#ifdef lint 3311#ifdef lint