diff options
| author | Eli Zaretskii | 2011-02-26 14:55:10 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-02-26 14:55:10 +0200 |
| commit | 003fa8b6f4bcf38941d7e1c219d9b0eaf78a6467 (patch) | |
| tree | ce059733ff478f3bea315373a8d897b1cd84ffd4 /src | |
| parent | 03382788bd912cd1bcd93598b4b67158f919f8bc (diff) | |
| download | emacs-003fa8b6f4bcf38941d7e1c219d9b0eaf78a6467.tar.gz emacs-003fa8b6f4bcf38941d7e1c219d9b0eaf78a6467.zip | |
Fix Sed scripts and srs/s/msdos.h for gnulib additions. Not tested yet.
src/s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04.
(lstat): Define for DJGPP < 2.04.
msdos/sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
(BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T)
(BITSIZEOF_WINT_TGNULIB_FCHMODAT, GNULIB_FSTATAT, GNULIB_FUTIMENS)
(GNULIB_LCHMOD, GNULIB_LSTAT, GNULIB_MBTOWC, GNULIB_MKDIRAT)
(GNULIB_MKFIFO, GNULIB_MKFIFOAT, GNULIB_MKNOD, GNULIB_MKNODAT)
(GNULIB_STAT, GNULIB_UTIMENSAT, GNULIB_WCTOMB, HAVE_FCHMODAT)
(HAVE_FSTATAT, HAVE_FUTIMENS, HAVE_INTTYPES_H, HAVE_LCHMOD)
(HAVE_LONG_LONG_INT, HAVE_LSTAT, HAVE_MKDIRAT, HAVE_MKFIFO)
(HAVE_MKFIFOAT, HAVE_MKNOD, HAVE_MKNODAT)
(HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WCHAR_T)
(HAVE_SIGNED_WINT_T, HAVE_STDINT_H, HAVE_SYS_BITYPES_H)
(HAVE_SYS_INTTYPES_H, HAVE_SYS_TYPES_H)
(HAVE_UNSIGNED_LONG_LONG_INT, HAVE_UTIMENSAT, HAVE_WCHAR_H)
(MKDIR_P, NEXT_AS_FIRST_DIRECTIVE_STDINT_H)
(NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H, NEXT_STDINT_H)
(NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR)
(REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT)
(REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H)
(WCHAR_T_SUFFIX, WINT_T_SUFFIX): New edits.
($(MKDIR_P)): Replace with equivalent DOS command.
msdos/sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
(BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T)
(HAVE_LONG_LONG_INT, HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WINT_T)
(HAVE_UNSIGNED_LONG_LONG_INT, HAVE_WCHAR_H, HAVE_INTTYPES_H): New
edits.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/s/msdos.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 29a213a1e09..b49b7a2d3f1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-02-26 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04. | ||
| 4 | (lstat): Define for DJGPP < 2.04. | ||
| 5 | |||
| 1 | 2011-02-25 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-02-25 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * dired.c (Ffile_attributes): Increase size of modes from 10 to 12 | 8 | * dired.c (Ffile_attributes): Increase size of modes from 10 to 12 |
diff --git a/src/s/msdos.h b/src/s/msdos.h index 8debd28dccb..29ca0629899 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h | |||
| @@ -80,6 +80,12 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 80 | strtold, so use _strtold in all versions. */ | 80 | strtold, so use _strtold in all versions. */ |
| 81 | #define strtold _strtold | 81 | #define strtold _strtold |
| 82 | 82 | ||
| 83 | #if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3 | ||
| 84 | # define HAVE_LSTAT 1 | ||
| 85 | #else | ||
| 86 | # define lstat stat | ||
| 87 | #endif | ||
| 88 | |||
| 83 | /* End of gnulib-related stuff. */ | 89 | /* End of gnulib-related stuff. */ |
| 84 | 90 | ||
| 85 | /* When $TERM is "internal" then this is substituted: */ | 91 | /* When $TERM is "internal" then this is substituted: */ |