aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-09-29 15:13:54 +0300
committerEli Zaretskii2011-09-29 15:13:54 +0300
commit68b98f17f9dbf0384e83d03ca01ee8ddd2217eeb (patch)
treef1c20173ec2b68bef0eee27a3bb595fadcf31b05 /src
parentccee00c0189fe7f59ef6136292d37a28378e52a0 (diff)
parent7cc013b5ba8d4141b100228494d4044b112120ad (diff)
downloademacs-68b98f17f9dbf0384e83d03ca01ee8ddd2217eeb.tar.gz
emacs-68b98f17f9dbf0384e83d03ca01ee8ddd2217eeb.zip
Fix the MSDOS build due to recent changes.
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 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/sysdep.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f26754d1135..dcbeffac1b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-09-29 Eli Zaretskii <eliz@gnu.org>
2
3 * sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined,
4 use EDOM.
5
12011-09-28 Eli Zaretskii <eliz@gnu.org> 62011-09-28 Eli Zaretskii <eliz@gnu.org>
2 7
3 * xdisp.c (compute_display_string_end): If there's no display 8 * xdisp.c (compute_display_string_end): If there's no display
diff --git a/src/sysdep.c b/src/sysdep.c
index f97a8585253..b0d5a1abbe3 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1844,7 +1844,11 @@ snprintf (char *buf, size_t bufsize, char const *format, ...)
1844 1844
1845 if (INT_MAX < nbytes) 1845 if (INT_MAX < nbytes)
1846 { 1846 {
1847#ifdef EOVERFLOW
1847 errno = EOVERFLOW; 1848 errno = EOVERFLOW;
1849#else
1850 errno = EDOM;
1851#endif
1848 return -1; 1852 return -1;
1849 } 1853 }
1850 return nbytes; 1854 return nbytes;