From: Glenn Morris Date: Wed, 1 Aug 2012 15:19:51 +0000 (-0700) Subject: Remove src/s/msdos.h X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/fe3cc7713a8ed1263826543ca3a87fdf2475630f Remove src/s/msdos.h * msdos/sed2v2.inp (MSDOS, DOS_NT, FLOAT_CHECK_DOMAIN) (HAVE_INVERSE_HYPERBOLIC, DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP) (INTERNAL_TERMINAL, NULL_DEVICE, SEPCHAR, USER_FULL_NAME) (_setjmp, _longjmp): Move here from src/s/msdos.h. (config_opsysfile, config_machfile): Remove. * msdos/sed1v2.inp (M_FILE, S_FILE): Remove. * msdos/mainmake.v2 (TAGS tags): Remove src/s/msdos.h. * src/s/msdos.h: Remove file. * src/conf_post.h [MSDOS]: New section, moved from s/msdos.h. * src/Makefile.in (S_FILE): Remove. (config_h): Remove S_FILE. --- diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 503c7cbf8a..ebd4b13794 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,13 @@ +2012-08-01 Glenn Morris + + * sed2v2.inp (MSDOS, DOS_NT, FLOAT_CHECK_DOMAIN) + (HAVE_INVERSE_HYPERBOLIC, DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP) + (INTERNAL_TERMINAL, NULL_DEVICE, SEPCHAR, USER_FULL_NAME) + (_setjmp, _longjmp): Move here from src/s/msdos.h. + (config_opsysfile, config_machfile): Remove. + * sed1v2.inp (M_FILE, S_FILE): Remove. + * mainmake.v2 (TAGS tags): Remove src/s/msdos.h. + 2012-07-31 Glenn Morris * sed1v2.inp (S_FILE): Update for format change. diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index e1e646a855..3df6ca1782 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -161,8 +161,7 @@ TAGS tags: lib-src FRC cd src ../bin/etags --include=../lisp/TAGS \ --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ - $(CURDIR)/src/*.c $(CURDIR)/src/*.h \ - $(CURDIR)/src/s/msdos.h + $(CURDIR)/src/*.c $(CURDIR)/src/*.h cd .. ./bin/etags --include=src/TAGS diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 1fd81ba0e4..0ed8893169 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -128,8 +128,6 @@ s/\.h\.in/.h-in/ /^DEPFLAGS *=/s/@DEPFLAGS@// /^MKDEPDIR *=/s/@MKDEPDIR@// /^version *=/s/@[^@\n]*@// -/^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h! -/^S_FILE *=/s!=!= $(srcdir)/s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// /^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC! /^ [ ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp! diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 214480a27a..c8abf36db3 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -26,7 +26,11 @@ #define NSIG 320\ #endif +/^#undef MSDOS *$/s/^.*$/#define MSDOS/ +/^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ +/^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ /^#undef HAVE_ALLOCA *$/s/^.*$/#define HAVE_ALLOCA 1/ +/^#undef HAVE_INVERSE_HYPERBOLIC *$/s/^.*$/#define HAVE_INVERSE_HYPERBOLIC/ /^#undef HAVE_SETITIMER *$/s/^.*$/#define HAVE_SETITIMER 1/ /^#undef HAVE_STRUCT_UTIMBUF *$/s/^.*$/#define HAVE_STRUCT_UTIMBUF 1/ /^#undef LOCALTIME_CACHE *$/s/^.*$/#define LOCALTIME_CACHE 1/ @@ -80,6 +84,15 @@ /^#undef HAVE_SIGNED_WINT_T *$/s/^.*$/#define HAVE_SIGNED_WINT_T 1/ /^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define HAVE_UNSIGNED_LONG_LONG_INT 1/ /^#under HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/ +/^#undef DEVICE_SEP *$/s/^.*$/#define DEVICE_SEP ':'/ +/^#undef IS_DIRECTORY_SEP *$/s/^.*$/#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\')/ +/^#undef IS_ANY_SEP *$/s/^.*$/#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))/ +/^#undef INTERNAL_TERMINAL *$/s/^.*$/#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display::co#80:li#25:Co#16:pa#256:km:ms:cm=:cl=:ce=::se=:so=:us=
    :ue=
:md=:mh=:mb=:mr=:me=::AB=:AF=:op=:"/ +/^#undef NULL_DEVICE *$/s/^.*$/#define NULL_DEVICE "nul"/ +/^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR ';'/ +/^#undef USER_FULL_NAME *$/s/^.*$/#define USER_FULL_NAME (getenv ("NAME"))/ +/^#undef _setjmp/s/^.*$/#define _setjmp setjmp/ +/^#undef _longjmp/s/^.*$/#define _longjmp longjmp/ /^#undef inline/s/^.*$/#define inline __inline__/ /^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/ /^#undef restrict/s/^.*$/#define restrict __restrict/ @@ -90,8 +103,6 @@ s/^#undef STACK_DIRECTION *$/#define STACK_DIRECTION -1/ s/^#undef EMACS_CONFIGURATION *$/#define EMACS_CONFIGURATION "i386-pc-msdosdjgpp"/ s/^#undef EMACS_CONFIG_OPTIONS *$/#define EMACS_CONFIG_OPTIONS "msdos"/ -s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"! -s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"! s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/ /^#undef HAVE_INTTYPES_H/c\ diff --git a/src/ChangeLog b/src/ChangeLog index 97e4d71baa..3640524b41 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-08-01 Glenn Morris + + * s/msdos.h: Remove file. + * conf_post.h [MSDOS]: New section, moved from s/msdos.h. + * Makefile.in (S_FILE): Remove. + (config_h): Remove S_FILE. + 2012-08-01 Juanma Barranquero * s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP): diff --git a/src/Makefile.in b/src/Makefile.in index b8298dfa10..687b3ce9aa 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -56,9 +56,7 @@ lwlibdir = ../lwlib lispdir = ../lisp # Configuration files for .o files to depend on. -# MS-DOS sets S_FILE non-nil. -S_FILE = -config_h = config.h conf_post.h $(S_FILE) +config_h = config.h conf_post.h bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) diff --git a/src/conf_post.h b/src/conf_post.h index c4a27c10d8..c69e961067 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -74,6 +74,46 @@ along with GNU Emacs. If not, see . */ #define vfork fork #endif /* DARWIN_OS */ +#ifdef MSDOS +#ifndef __DJGPP__ +You lose; /* Emacs for DOS must be compiled with DJGPP */ +#endif +#define _NAIVE_DOS_REGS + +/* Start of gnulib-related stuff */ + +/* lib/ftoastr.c wants strtold, but DJGPP only has _strtold. DJGPP > + 2.03 has it, but it also has _strtold as a stub that jumps to + strtold, so use _strtold in all versions. */ +#define strtold _strtold + +#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3 +# define HAVE_LSTAT 1 +#else +# define lstat stat +#endif +/* End of gnulib-related stuff. */ + +/* Define one of these for easier conditionals. */ +#ifdef HAVE_X_WINDOWS +/* We need a little extra space, see ../../lisp/loadup.el and the + commentary below, in the non-X branch. The 140KB number was + measured on GNU/Linux and on MS-Windows. */ +#define SYSTEM_PURESIZE_EXTRA (-170000+140000) +#else +/* We need a little extra space, see ../../lisp/loadup.el. + As of 20091024, DOS-specific files use up 62KB of pure space. But + overall, we end up wasting 130KB of pure space, because + BASE_PURESIZE starts at 1.47MB, while we need only 1.3MB (including + non-DOS specific files and load history; the latter is about 55K, + but depends on the depth of the top-level Emacs directory in the + directory tree). Given the unknown policy of different DPMI + hosts regarding loading of untouched pages, I'm not going to risk + enlarging Emacs footprint by another 100+ KBytes. */ +#define SYSTEM_PURESIZE_EXTRA (-170000+65000) +#endif +#endif MSDOS /* MSDOS */ + /* We have to go this route, rather than the old hpux9 approach of renaming the functions via macros. The system's stdlib.h has fully prototyped declarations, which yields a conflicting definition of diff --git a/src/s/msdos.h b/src/s/msdos.h deleted file mode 100644 index 15112dad7a..0000000000 --- a/src/s/msdos.h +++ /dev/null @@ -1,114 +0,0 @@ -/* System description file for MS-DOS - -Copyright (C) 1993, 1996-1997, 2001-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -/* Note: lots of stuff here was taken from s-msdos.h in demacs. */ - - -/* Define symbols to identify the version of Unix this is. - Define all the symbols that apply correctly. */ -#ifndef MSDOS -#define MSDOS -#endif - -#ifndef __DJGPP__ -You lose; /* Emacs for DOS must be compiled with DJGPP */ -#endif - -#define DOS_NT /* MSDOS or WINDOWSNT */ - -/* subprocesses should be defined if you want to have code for - asynchronous subprocesses (as used in M-x compile and M-x shell). - This is the only system that needs this. */ -#undef subprocesses - -/* Here, on a separate page, add any special hacks needed to make - Emacs work on this system. For example, you might define certain - system call names that don't exist on your system, or that do - different things on your system and must be used only through an - encapsulation (which you should place, by convention, in sysdep.c). */ - -/* This overrides the default value on editfns.c, since DJGPP - does not have pw->pw_gecos. */ -#define USER_FULL_NAME (getenv ("NAME")) - -/* setjmp and longjmp can safely replace _setjmp and _longjmp, - but they will run slower. */ -#define _setjmp setjmp -#define _longjmp longjmp - -#define _NAIVE_DOS_REGS - -/* Used by emacs.c:decode_env_path. */ -#define SEPCHAR ';' - -/* Used by callproc.c (and process.c, but in the part not compiled on - MSDOS). The default is defined on process.h. */ -#define NULL_DEVICE "nul" - -/* Used by floatfns.c. */ -#define HAVE_INVERSE_HYPERBOLIC -#define FLOAT_CHECK_DOMAIN - -/* Start of gnulib-related stuff */ - -/* lib/ftoastr.c wants strtold, but DJGPP only has _strtold. DJGPP > - 2.03 has it, but it also has _strtold as a stub that jumps to - strtold, so use _strtold in all versions. */ -#define strtold _strtold - -#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3 -# define HAVE_LSTAT 1 -#else -# define lstat stat -#endif - -/* End of gnulib-related stuff. */ - -/* When $TERM is "internal" then this is substituted: */ -#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\ -:co#80:li#25:Co#16:pa#256:km:ms:cm=:cl=:ce=:\ -:se=:so=:us=
    :ue=
:md=:mh=:mb=:mr=:me=:\ -:AB=:AF=:op=:" - -/* Define this to be the separator between devices and paths. Used by - lisp.h to define IS_DEVICE_SEP. */ -#define DEVICE_SEP ':' - -/* We'll support either convention of slashes on MSDOS. */ -#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') -#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) - -/* Define one of these for easier conditionals. */ -#ifdef HAVE_X_WINDOWS -/* We need a little extra space, see ../../lisp/loadup.el and the - commentary below, in the non-X branch. The 140KB number was - measured on GNU/Linux and on MS-Windows. */ -#define SYSTEM_PURESIZE_EXTRA (-170000+140000) -#else -/* We need a little extra space, see ../../lisp/loadup.el. - As of 20091024, DOS-specific files use up 62KB of pure space. But - overall, we end up wasting 130KB of pure space, because - BASE_PURESIZE starts at 1.47MB, while we need only 1.3MB (including - non-DOS specific files and load history; the latter is about 55K, - but depends on the depth of the top-level Emacs directory in the - directory tree). Given the unknown policy of different DPMI - hosts regarding loading of untouched pages, I'm not going to risk - enlarging Emacs footprint by another 100+ KBytes. */ -#define SYSTEM_PURESIZE_EXTRA (-170000+65000) -#endif