diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-08-09 20:02:10 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-08-09 20:02:10 -0400 |
| commit | 9374581a2448ff52315bc9a5037dcec504167702 (patch) | |
| tree | 017f604281be58c739d51347c5b4a7397b0b6eda /lib-src/make-docfile.c | |
| parent | 59a428eb3f1accfe9da6212d2695870d63037bbe (diff) | |
Move DIRECTORY_SEP from lisp.h to config.h
* configure.ac (DIRECTORY_SEP): Move here from src/lisp.h.
* src/lisp.h (DIRECTORY_SEP): Let configure set it.
* nt/config.nt (DIRECTORY_SEP): Move here from src/lisp.h.
* lib-src/movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
* lib-src/make-docfile.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
* lib-src/emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP):
Remove (they are in config.h now).
Diffstat (limited to 'lib-src/make-docfile.c')
| -rw-r--r-- | lib-src/make-docfile.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index bd87b5b652..c2ac8ed63f 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -1,6 +1,7 @@ /* Generate doc-string file for GNU Emacs from source files. - Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2012 - Free Software Foundation, Inc. + +Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2012 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -36,12 +37,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> /* Defined to be emacs_main, sys_fopen, etc. in config.h. */ +/* FIXME Not for ages? */ #undef main #undef fopen #undef chdir #include <stdio.h> -#include <stdlib.h> +#include <stdlib.h> /* FIXME config.h unconditionally includes this */ #ifdef MSDOS #include <fcntl.h> #endif /* MSDOS */ @@ -58,14 +60,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define READ_BINARY "r" #endif /* not DOS_NT */ -#ifndef DIRECTORY_SEP -#define DIRECTORY_SEP '/' -#endif - -#ifndef IS_DIRECTORY_SEP -#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) -#endif - /* Use this to suppress gcc's `...may be used before initialized' warnings. */ #ifdef lint # define IF_LINT(Code) Code @@ -79,6 +73,8 @@ static int scan_c_file (char *filename, const char *mode); static void start_globals (void); static void write_globals (void); +/* FIXME msdos does not define this any more, and in any case we + undefined it for everyone just above. */ #ifdef MSDOS /* s/msdos.h defines this as sys_chdir, but we're not linking with the file where that function is defined. */ |