diff options
author | Glenn Morris <rgm@gnu.org> | 2018-03-22 07:50:37 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-03-22 07:50:37 -0700 |
commit | 0afb436eeb9b87dbd13b012e3b13d51fc6745f0d (patch) | |
tree | 683cf853c6bc6065a5f5a3d9ae81feda1882da95 /msdos | |
parent | 081c39beb0340f5d6084dc90796ba726a52c928e (diff) | |
parent | 8ac621bb5594786c66cc724864e6037c8c650774 (diff) | |
download | emacs-0afb436eeb9b87dbd13b012e3b13d51fc6745f0d.tar.gz |
Merge from origin/emacs-26
8ac621b (origin/emacs-26) Document DEFUN attributes
16d0cc7 * etc/NEWS: Add an entry for auth-source-pass.
cc1702f Fix the MSDOS build
daa9e85 Improve warning and error messages
7612dd1 Adjust eieio persistence tests for expected failure
f0cf4dc Let eieio-persistent-read read what object-write has written
40ad1ff Handle possible classtype values in eieio-persistent-read
4ec935d Add new tests for eieio persistence
47917d8 * lisp/gnus/gnus-cloud.el (gnus-cloud-synced-files): Fix doc ...
e32f352 * lisp/ibuf-ext.el (ibuffer-never-search-content-mode): Fix t...
5268f30 * doc/lispref/windows.texi (Selecting Windows): Fix a typo.
143b485 * doc/lispref/internals.texi (Writing Emacs Primitives): Fix ...
4ab4551 Firm up documentation of generalized variables
a5bf099 Improve documentation of Auto-Revert mode
ed05eaa Improvements in dired.texi
Conflicts:
etc/NEWS
Diffstat (limited to 'msdos')
-rw-r--r-- | msdos/sed2v2.inp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index c57fa4b0416..d6544052d29 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -32,6 +32,7 @@ /^#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_SBRK *$/s/^.*$/#define HAVE_SBRK 1/ /^#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/ |