diff options
author | Eli Zaretskii <eliz@gnu.org> | 2011-09-29 15:00:18 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2011-09-29 15:00:18 +0300 |
commit | 31bed4862096a95c1dc9a44d4561a5d08436ac3b (patch) | |
tree | 1630dde710c43ade06d4d48870300b97e504bd72 /msdos/inttypes.h | |
parent | 52aa0014e753e81ec0ed1d6fcd7cf25c01dd0071 (diff) | |
download | emacs-31bed4862096a95c1dc9a44d4561a5d08436ac3b.tar.gz emacs-31bed4862096a95c1dc9a44d4561a5d08436ac3b.tar.bz2 emacs-31bed4862096a95c1dc9a44d4561a5d08436ac3b.zip |
Fix the MSDOS build.
msdos/mainmake.v2 (boot): Condition the value on the existence of
autogen/README, not admin/admin.el, since the latter is now part
of the release tarball.
(install): Don't copy lib-src/fns.el, as that file is no longer
generated in that directory.
msdos/sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty.
(SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of
GCONF_CFLAGS and GCONF_LIBS.
msdos/sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP)
(GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE)
(GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION)
(GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC)
(HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING)
(HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION)
(HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T)
(HAVE_STRUCT_SIGACTION_SA_SIGACTION)
(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD)
(LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H)
(NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK)
(REPLACE_RAISE): New edits.
(gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o. Add
pthread_sigmask.o.
(@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit
to comment out unneeded lines.
(warn-on-use.h): Edit the recipe commands to work with DJGPP
without requiring a Unixy shell.
msdos/inttypes.h (strtoimax) [DJGPP < 2.04]: New macro.
msdos/sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX)
(HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits.
.bzrignore: Add ./GNUMakefile.unix.
config.bat: Rename GNUMakefile, so it is not run on MS-DOS.
Rename signal.in.h and alloca.in.h.
src/sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined,
use EDOM.
Diffstat (limited to 'msdos/inttypes.h')
-rw-r--r-- | msdos/inttypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/msdos/inttypes.h b/msdos/inttypes.h index e21f1b1055c..2c9b2b2cd11 100644 --- a/msdos/inttypes.h +++ b/msdos/inttypes.h @@ -30,6 +30,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #else /* __DJGPP__ < 2.04 */ #include <stdlib.h> #define strtoumax strtoull +#define strtoimax strtoll #endif /* __DJGPP__ < 2.04 */ #endif |