mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00
Code Issues Releases Activity

Remove some make-docfile.c undes that are no longer needed

Browse Source 
* lib-src/make-docfile.c (main):
(fopen) [!WINDOWSNT]:
(chdir) [!DOS_NT]: No more need to undef.
This commit is contained in:
Glenn Morris 2012-08-09 20:16:33 -04:00
parent 9374581a24
commit 9748df5d77
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib-src/ChangeLog
View File

@ -1,5 +1,9 @@
2012-08-10 Glenn Morris <rgm@gnu.org>
* make-docfile.c (main):
(fopen) [!WINDOWSNT]:
(chdir) [!DOS_NT]: No more need to undef.
* movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
* make-docfile.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
* emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP):

25
lib-src/make-docfile.c
View File

@ -36,23 +36,26 @@ 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> /* FIXME config.h unconditionally includes this */
#include <stdlib.h> /* config.h unconditionally includes this anyway */
#ifdef MSDOS
#include <fcntl.h>
#endif /* MSDOS */
#ifdef WINDOWSNT
/* Defined to be sys_fopen in ms-w32.h, but only #ifdef emacs, so this
is really just insurance. */
#undef fopen
#include <fcntl.h>
#include <direct.h>
#endif /* WINDOWSNT */
#ifdef DOS_NT
/* Defined to be sys_chdir in ms-w32.h, but only #ifdef emacs, so this
is really just insurance.
Similarly, msdos defines this as sys_chdir, but we're not linking with the
file where that function is defined. */
#undef chdir
#define READ_TEXT "rt"
#define READ_BINARY "rb"
#else /* not DOS_NT */
@ -73,14 +76,6 @@ 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. */
#undef chdir
#endif
#include <unistd.h>
/* Stdio stream for output to the DOC file. */