diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 17:57:35 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 17:57:35 +0200 |
| commit | 9d9d12cdf35151946d2429845a72149c5a7309e4 (patch) | |
| tree | 9c8d43067efc1129d682005ad923e014b882c98f /msdos/sed2v2.inp | |
| parent | 56e96bed349771df1df56546450a21afc75c00d3 (diff) | |
| download | emacs-9d9d12cdf35151946d2429845a72149c5a7309e4.tar.gz | |
Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
src/s/msdos.h (strtold): Define to _strtold.
admin/admin.el (set-version): Add msdos/sed2v2.inp.
Diffstat (limited to 'msdos/sed2v2.inp')
| -rw-r--r-- | msdos/sed2v2.inp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 98e398053e3..d885bbc97e2 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -34,6 +34,8 @@ /^#undef HAVE_FREXP *$/s/^.*$/#define HAVE_FREXP 1/ /^#undef HAVE_FMOD *$/s/^.*$/#define HAVE_FMOD 1/ /^#undef HAVE_RINT *$/s/^.*$/#define HAVE_RINT 1/ +/^#undef HAVE_ATTRIBUTE_ALIGNED *$/s/^.*$/#define HAVE_ATTRIBUTE_ALIGNED 1/ +/^#undef HAVE_C99_STRTOLD *$/s/^.*$/#define HAVE_C99_STRTOLD 1/ /^#undef HAVE_CBRT *$/s/^.*$/#define HAVE_CBRT 1/ /^#undef HAVE_DIFFTIME *$/s/^.*$/#define HAVE_DIFFTIME 1/ /^#undef HAVE_FPATHCONF *$/s/^.*$/#define HAVE_FPATHCONF 1/ @@ -56,8 +58,13 @@ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ +/^#undef VERSION/s/^.*$/#define VERSION "24.0.50"/ +/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/ +/^#undef HAVE__BOOL/s/^.*$/#define HAVE__BOOL 1/ +/^#undef inline/s/^.*$/#define inline __inline__/ +/^#undef restrict/s/^.*$/#define restrict __restrict/ /^#undef GNU_MALLOC *$/s/^.*$/#define GNU_MALLOC 1/ /^#undef REL_ALLOC *$/s/^.*$/#define REL_ALLOC 1/ @@ -69,15 +76,6 @@ 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/ -# ------------------------------------------------------------ -# Without this ifndef, gcc -E -traditional barfs with GCC 3.0 -# on the line which says if ! HAVE_MKTIME... -# ------------------------------------------------------------ -/^#if ! HAVE_MKTIME || BROKEN_MKTIME/i\ -#ifndef __DJGPP__ -/^#define mktime emacs_mktime/a\ -#endif - /^#undef HAVE_STDINT_H/c\ #if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\ #define HAVE_STDINT_H 1\ |