diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-08-27 18:59:29 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-08-27 18:59:29 -0700 |
| commit | 6d26235315194737c4dc8653cf6d05177a10fa9c (patch) | |
| tree | 4a80f49f2073d80610931dd8706e90527a98340b /msdos | |
| parent | 93b31b57283d369fefc5c95082d7b09288f05128 (diff) | |
| parent | b62da77c1c94b393f8be7854ff1cb30b012aa238 (diff) | |
| download | emacs-6d26235315194737c4dc8653cf6d05177a10fa9c.tar.gz | |
Merge from emacs-24; up to 2014-07-02T00:57:53Z!juri@jurta.org
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 10 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 2 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 150ef22c444..da0d7098d1a 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,13 @@ +2014-08-28 Eli Zaretskii <eliz@gnu.org> + + * sedlibmk.inp (gl_LIBOBJS): Add execinfo.o. Reported by Juan + Manuel Guerrero <juan.guerrero@gmx.de>. + + * sed2v2.inp [DJGPP <= 2.03]: Add a prototype for snprintf, to + avoid compilation warning from newer GCC versions that have + snprintf as a built-in. Reported by Juan Manuel Guerrero + <juan.guerrero@gmx.de>. + 2014-08-09 Eli Zaretskii <eliz@gnu.org> * INSTALL: Fix last change. diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 94cd997125f..976b74f1d4a 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -127,6 +127,8 @@ s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/ #define HAVE_SNPRINTF 1\ #else\ #undef HAVE_SNPRINTF\ +#include <sys/types.h>\ +extern int snprintf (char *__restrict, size_t, const char *__restrict, ...);\ #endif s/^#undef PENDING_OUTPUT_N_BYTES *$/#define PENDING_OUTPUT_N_BYTES fp->_ptr - fp->_base/ diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index badb30b0b65..b896eadc22d 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -315,6 +315,7 @@ am__cd = cd /^BYTESWAP_H *=/s/@[^@\n]*@/byteswap.h/ /^DIRENT_H *=/s/@[^@\n]*@// /^ERRNO_H *=/s/@[^@\n]*@// +/^EXECINFO_H *=/s/@[^@\n]*@/execinfo.h/ /^STDBOOL_H *=/s/@[^@\n]*@// /^STDALIGN_H *=/s/@[^@\n]*@/stdalign.h/ /^STDARG_H *=/s/@[^@\n]*@// @@ -333,7 +334,7 @@ am__cd = cd /am__append_[1-9][0-9]* *=.*gettext\.h/s/@[^@\n]*@/\#/ /am__append_2 *=.*verify\.h/s/@[^@\n]*@// /^@gl_GNULIB_ENABLED_tempname_TRUE@/s/@[^@\n]*@// -/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o/ +/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o execinfo.o/ /^am__append_[1-9][0-9]* *=/,/^[^ ]/{ s/ *inttypes\.h// s| *sys/select\.h|| |