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.
This commit is contained in:
Eli Zaretskii
parent
52aa0014e7
commit
31bed48620
11 changed files with 119 additions and 86 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2011-09-29 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* .bzrignore: Add ./GNUMakefile.unix.
|
||||
|
||||
* config.bat: Rename GNUMakefile, so it is not run on MS-DOS.
|
||||
Rename signal.in.h and alloca.in.h.
|
||||
|
||||
2011-09-28 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* INSTALL: Mention that m17n libraries and libotf are needed for
|
||||
|
|
|
|||
77
GNUmakefile
77
GNUmakefile
|
|
@ -1,77 +0,0 @@
|
|||
# Build Emacs from a fresh tarball or version-control checkout.
|
||||
|
||||
# Copyright 2011 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is part of GNU Emacs.
|
||||
#
|
||||
# GNU Emacs is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# GNU Emacs is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# written by Paul Eggert
|
||||
|
||||
|
||||
# This GNUmakefile is for GNU Make. It is for convenience, so that
|
||||
# one can run 'make' in an unconfigured source tree. In such a tree,
|
||||
# this file causes GNU Make to first create a standard configuration
|
||||
# with the default options, and then reinvokes itself on the
|
||||
# newly-built Makefile. If the source tree is already configured,
|
||||
# this file defers to the existing Makefile.
|
||||
|
||||
# If you are using a non-GNU 'make', or if you want non-default build
|
||||
# options, or if you want to build in an out-of-source tree, please
|
||||
# run "configure" by hand. But run autogen.sh first, if the source
|
||||
# was checked out directly from the repository.
|
||||
|
||||
|
||||
# If a Makefile already exists, just use it.
|
||||
|
||||
ifeq ($(wildcard Makefile),Makefile)
|
||||
include Makefile
|
||||
else
|
||||
|
||||
# If cleaning and Makefile does not exist, don't bother creating it.
|
||||
# The source tree is already clean, or is in a weird state that
|
||||
# requires expert attention.
|
||||
|
||||
ifeq ($(filter-out %clean,$(or $(MAKECMDGOALS),default)),)
|
||||
|
||||
$(MAKECMDGOALS):
|
||||
@echo >&2 'No Makefile; skipping $@.'
|
||||
|
||||
else
|
||||
|
||||
# No Makefile, and not cleaning.
|
||||
# If 'configure' does not exist, Emacs must have been checked
|
||||
# out directly from the repository; run ./autogen.sh.
|
||||
# Once 'configure' exists, run it.
|
||||
# Finally, run the actual 'make'.
|
||||
|
||||
default $(filter-out configure Makefile,$(MAKECMDGOALS)): Makefile
|
||||
$(MAKE) -f Makefile $(MAKECMDGOALS)
|
||||
# Execute in sequence, so that multiple user goals don't conflict.
|
||||
.NOTPARALLEL:
|
||||
|
||||
configure:
|
||||
@echo >&2 'There seems to be no "configure" file in this directory.'
|
||||
@echo >&2 'Running ./autogen.sh || autogen/copy_autogen ...'
|
||||
./autogen.sh || autogen/copy_autogen
|
||||
@echo >&2 '"configure" file built.'
|
||||
|
||||
Makefile: configure
|
||||
@echo >&2 'There seems to be no Makefile in this directory.'
|
||||
@echo >&2 'Running ./configure ...'
|
||||
./configure
|
||||
@echo >&2 'Makefile built.'
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
@ -279,8 +279,10 @@ If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-au
|
|||
cd lib
|
||||
Rem Rename files like djtar on plain DOS filesystem would.
|
||||
If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-aux/snippet/cxxdefs.h
|
||||
If Exist alloca.in.h update alloca.in.h alloca.in-h
|
||||
If Exist getopt.in.h update getopt.in.h getopt.in-h
|
||||
If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
|
||||
If Exist signal.in.h update signal.in.h signal.in-h
|
||||
If Exist stddef.in.h update stddef.in.h stddef.in-h
|
||||
If Exist stdint.in.h update stdint.in.h stdint.in-h
|
||||
If Exist stdio.in.h update stdio.in.h stdio.in-h
|
||||
|
|
@ -326,6 +328,8 @@ Echo Then run CONFIG.BAT again with the same arguments you did now.
|
|||
goto End
|
||||
:gdbinitOk
|
||||
Echo Looking for the GDB init file...found
|
||||
rem GNUMakefile is not appropriate for MS-DOS so move it out of the way
|
||||
If Exist GNUMakefile mv -f GNUMakefile GNUMakefile.unix
|
||||
copy msdos\mainmake.v2 Makefile >nul
|
||||
rem ----------------------------------------------------------------------
|
||||
goto End
|
||||
|
|
|
|||
|
|
@ -1,3 +1,39 @@
|
|||
2011-09-29 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* 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.
|
||||
|
||||
* sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty.
|
||||
(SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of
|
||||
GCONF_CFLAGS and GCONF_LIBS.
|
||||
|
||||
* 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.
|
||||
|
||||
* inttypes.h (strtoimax) [DJGPP < 2.04]: New macro.
|
||||
|
||||
* sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX)
|
||||
(HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits.
|
||||
|
||||
2011-09-06 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -64,12 +64,13 @@ MAKESHELL=/xyzzy/command
|
|||
top_srcdir := $(subst \,/,$(shell cd))
|
||||
|
||||
# Q: Do we need to bootstrap?
|
||||
# A: Only if we find admin/admin.el, i.e. we are building out of
|
||||
# a VCS-checkout (not a release) and src/b-emacs.exe does not exist.
|
||||
# A: Only if we find autogen/README, i.e. we are building out of
|
||||
# a VCS-checkout (not a release), and src/b-emacs.exe does not exist.
|
||||
# This avoids building a bootstrap-emacs and recompiling Lisp files
|
||||
# when building a pretest/release tarball.
|
||||
# when building a pretest/release tarball. Recompiling Lisp files
|
||||
# is BAD because lisp/Makefile.in requires a Unixy shell.
|
||||
boot :=
|
||||
ifneq ($(wildcard admin/admin.el),)
|
||||
ifneq ($(wildcard autogen/README),)
|
||||
ifeq ($(wildcard src/b-emacs.exe),)
|
||||
boot := b-emacs.exe
|
||||
endif
|
||||
|
|
@ -132,7 +133,6 @@ install: all
|
|||
cd lib-src
|
||||
command.com /c >/dev/null for %p in (hexl etags ctags ebrowse) do\
|
||||
if exist %p.exe mv -f %p.exe ../bin
|
||||
if exist fns.el update fns.el ../bin/fns.el
|
||||
cd ..
|
||||
cd src
|
||||
mv -f emacs.exe ../bin/
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ s/\.h\.in/.h-in/
|
|||
/^LIB_GCC *=/s/@LIB_GCC@//
|
||||
/^LIB_STANDARD *=/s/@LIB_STANDARD@//
|
||||
/^LIB_MATH *=/s/@LIB_MATH@/-lm/
|
||||
/^LIB_PTHREAD *=/s/@LIB_PTHREAD@//
|
||||
/^LIBTIFF *=/s/@LIBTIFF@//
|
||||
/^LIBJPEG *=/s/@LIBJPEG@//
|
||||
/^LIBPNG *=/s/@LIBPNG@//
|
||||
|
|
@ -70,8 +71,8 @@ s/\.h\.in/.h-in/
|
|||
/^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@//
|
||||
/^DBUS_LIBS *=/s/@DBUS_LIBS@//
|
||||
/^DBUS_OBJ *=/s/@DBUS_OBJ@//
|
||||
/^GCONF_CFLAGS *=/s/@GCONF_CFLAGS@//
|
||||
/^GCONF_LIBS *=/s/@GCONF_LIBS@//
|
||||
/^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@//
|
||||
/^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@//
|
||||
/^GTK_OBJ *=/s/@GTK_OBJ@//
|
||||
/^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@//
|
||||
/^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/
|
||||
|
|
@ -102,6 +103,7 @@ s/\.h\.in/.h-in/
|
|||
/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
|
||||
/^LIBRESOLV *=/s/@LIBRESOLV@//
|
||||
/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
|
||||
/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@//
|
||||
/^LIBGNUTLS_LIBS *=/s/@[^@\n]*@//
|
||||
/^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@//
|
||||
/^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#define NSIG 320\
|
||||
#endif
|
||||
|
||||
/^#undef HAVE_ALLOCA *$/s/^.*$/#define HAVE_ALLOCA 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/
|
||||
|
|
@ -100,10 +101,19 @@ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
|
|||
#else\
|
||||
#undef HAVE_STDINT_H\
|
||||
#endif
|
||||
s/^#undef HAVE_DECL_STRTOLL *$/#define HAVE_DECL_STRTOLL 1/
|
||||
s/^#undef HAVE_DECL_STRTOULL *$/#define HAVE_DECL_STRTOULL 1/
|
||||
s/^#undef HAVE_DECL_STRTOIMAX *$/#define HAVE_DECL_STRTOIMAX 1/
|
||||
s/^#undef HAVE_DECL_STRTOUMAX *$/#define HAVE_DECL_STRTOUMAX 1/
|
||||
s/^#undef HAVE_STRTOLL *$/#define HAVE_STRTOLL 1/
|
||||
s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/
|
||||
s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/
|
||||
/^#undef HAVE_SIGSET_T *$/s/^.*$/#define HAVE_SIGSET_T 1/
|
||||
/^#undef HAVE_SNPRINTF/c\
|
||||
#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\
|
||||
#define HAVE_SNPRINTF 1\
|
||||
#else\
|
||||
#undef HAVE_SNPRINTF\
|
||||
#endif
|
||||
|
||||
# Comment out any remaining undef directives, because some of them
|
||||
# might be defined in sys/config.h we include at the top of config.h.
|
||||
|
|
|
|||
|
|
@ -111,6 +111,8 @@ am__cd = cd
|
|||
/^ALLOCA *=/s/@[^@\n]*@//
|
||||
/^ALSA_CFLAGS *=/s/@[^@\n]*@//
|
||||
/^ALSA_LIBS *=/s/@[^@\n]*@//
|
||||
/^AR *=/s/@[^@\n]*@/ar/
|
||||
/^ARFLAGS *=/s/@[^@\n]*@/cru/
|
||||
/^AWK *=/s/@[^@\n]*@/gawk/
|
||||
/^CANNOT_DUMP *=/s/@[^@\n]*@/no/
|
||||
/^CC *=/s/@[^@\n]*@/gcc/
|
||||
|
|
@ -147,9 +149,11 @@ am__cd = cd
|
|||
/^GNULIB_ATOLL *=/s/@GNULIB_ATOLL@/1/
|
||||
/^GNULIB_CALLOC_POSIX *=/s/@GNULIB_CALLOC_POSIX@/0/
|
||||
/^GNULIB_CANONICALIZE_FILE_NAME *=/s/@GNULIB_CANONICALIZE_FILE_NAME@/0/
|
||||
/^GNULIB_CHDIR *=/s/@GNULIB_CHDIR@/0/
|
||||
/^GNULIB_CHOWN *=/s/@GNULIB_CHOWN@/0/
|
||||
/^GNULIB_CLOSE *=/s/@GNULIB_CLOSE@/0/
|
||||
/^GNULIB_DPRINTF *=/s/@GNULIB_DPRINTF@/0/
|
||||
/^GNULIB_DUP *=/s/@GNULIB_DUP@/0/
|
||||
/^GNULIB_DUP2 *=/s/@GNULIB_DUP2@/0/
|
||||
/^GNULIB_DUP3 *=/s/@GNULIB_DUP3@/1/
|
||||
/^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/0/
|
||||
|
|
@ -159,6 +163,8 @@ am__cd = cd
|
|||
/^GNULIB_FCHOWNAT *=/s/@GNULIB_FCHOWNAT@/0/
|
||||
/^GNULIB_FCHMODAT *=/s/@GNULIB_FCHMODAT@/0/
|
||||
/^GNULIB_FCLOSE *=/s/@GNULIB_FCLOSE@/0/
|
||||
/^GNULIB_FDATASYNC *=/s/@GNULIB_FDATASYNC@/0/
|
||||
/^GNULIB_FDOPEN *=/s/@GNULIB_FDOPEN@/0/
|
||||
/^GNULIB_FFLUSH *=/s/@GNULIB_FFLUSH@/0/
|
||||
/^GNULIB_FGETC *=/s/@GNULIB_FGETC@/0/
|
||||
/^GNULIB_FGETS *=/s/@GNULIB_FGETS@/0/
|
||||
|
|
@ -173,6 +179,7 @@ am__cd = cd
|
|||
/^GNULIB_FSCANF *=/s/@GNULIB_FSCANF@/0/
|
||||
/^GNULIB_FSEEK *=/s/@GNULIB_FSEEK@/0/
|
||||
/^GNULIB_FSEEKO *=/s/@GNULIB_FSEEKO@/0/
|
||||
/^GNULIB_FSTAT *=/s/@GNULIB_FSTAT@/0/
|
||||
/^GNULIB_FSTATAT *=/s/@GNULIB_FSTATAT@/0/
|
||||
/^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/
|
||||
/^GNULIB_FTELL *=/s/@GNULIB_FTELL@/0/
|
||||
|
|
@ -220,6 +227,7 @@ am__cd = cd
|
|||
/^GNULIB_NANOSLEEP *=/s/@GNULIB_NANOSLEEP@/0/
|
||||
/^GNULIB_OBSTACK_PRINTF *=/s/@GNULIB_OBSTACK_PRINTF@/0/
|
||||
/^GNULIB_OBSTACK_PRINTF_POSIX *=/s/@GNULIB_OBSTACK_PRINTF_POSIX@/0/
|
||||
/^GNULIB_PCLOSE *=/s/@GNULIB_PCLOSE@/0/
|
||||
/^GNULIB_PERROR *=/s/@GNULIB_PERROR@/0/
|
||||
/^GNULIB_PIPE *=/s/@GNULIB_PIPE@/0/
|
||||
/^GNULIB_PIPE2 *=/s/@GNULIB_PIPE2@/0/
|
||||
|
|
@ -227,12 +235,14 @@ am__cd = cd
|
|||
/^GNULIB_PREAD *=/s/@GNULIB_PREAD@/0/
|
||||
/^GNULIB_PRINTF *=/s/@GNULIB_PRINTF@/0/
|
||||
/^GNULIB_PRINTF_POSIX *=/s/@GNULIB_PRINTF_POSIX@/0/
|
||||
/^GNULIB_PTHREAD_SIGMASK *=/s/@GNULIB_PTHREAD_SIGMASK@/0/
|
||||
/^GNULIB_PTSNAME *=/s/@GNULIB_PTSNAME@/0/
|
||||
/^GNULIB_PUTC *=/s/@GNULIB_PUTC@/0/
|
||||
/^GNULIB_PUTCHAR *=/s/@GNULIB_PUTCHAR@/0/
|
||||
/^GNULIB_PUTENV *=/s/@GNULIB_PUTENV@/0/
|
||||
/^GNULIB_PUTS *=/s/@GNULIB_PUTS@/0/
|
||||
/^GNULIB_PWRITE *=/s/@GNULIB_PWRITE@/0/
|
||||
/^GNULIB_RAISE *=/s/@GNULIB_RAISE@/0/
|
||||
/^GNULIB_RANDOM_R *=/s/@GNULIB_RANDOM_R@/0/
|
||||
/^GNULIB_READ *=/s/@GNULIB_READ@/0/
|
||||
/^GNULIB_READLINK *=/s/@GNULIB_READLINK@/0/
|
||||
|
|
@ -246,6 +256,9 @@ am__cd = cd
|
|||
/^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/
|
||||
/^GNULIB_SCANF *=/s/@GNULIB_SCANF@/0/
|
||||
/^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/
|
||||
/^GNULIB_SIGACTION *=/s/@GNULIB_SIGACTION@/0/
|
||||
/^GNULIB_SIGNAL_H_SIGPIPE *=/s/@GNULIB_SIGNAL_H_SIGPIPE@/0/
|
||||
/^GNULIB_SIGPROCMASK *=/s/@GNULIB_SIGPROCMASK@/0/
|
||||
/^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/
|
||||
/^GNULIB_SNPRINTF *=/s/@GNULIB_SNPRINTF@/0/
|
||||
/^GNULIB_SPRINTF_POSIX *=/s/@GNULIB_SPRINTF_POSIX@/0/
|
||||
|
|
@ -285,11 +298,14 @@ am__cd = cd
|
|||
/^GNULIB_WCTOMB *=/s/@GNULIB_WCTOMB@/0/
|
||||
/^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/
|
||||
/^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/
|
||||
/^GSETTINGS_CFLAGS *=/s/@[^@\n]*@//
|
||||
/^GSETTINGS_LIBS *=/s/@[^@\n]*@//
|
||||
/^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/
|
||||
/^HAVE_CANONICALIZE_FILE_NAME *=/s/@HAVE_CANONICALIZE_FILE_NAME@/0/
|
||||
/^HAVE_CHOWN *=/s/@HAVE_CHOWN@/1/
|
||||
/^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/1/
|
||||
/^HAVE_DECL_FCHDIR *=/s/@HAVE_DECL_FCHDIR@/0/
|
||||
/^HAVE_DECL_FDATASYNC *=/s/@HAVE_DECL_FDATASYNC@/0/
|
||||
/^HAVE_DECL_FPURGE *=/s/@HAVE_DECL_FPURGE@//
|
||||
/^HAVE_DECL_FSEEKO *=/s/@HAVE_DECL_FSEEKO@/0/
|
||||
/^HAVE_DECL_FTELLO *=/s/@HAVE_DECL_FTELLO@/0/
|
||||
|
|
@ -315,6 +331,7 @@ am__cd = cd
|
|||
/^HAVE_FCHDIR *=/s/@HAVE_FCHDIR@/0/
|
||||
/^HAVE_FCHMODAT *=/s/@HAVE_FCHMODAT@/0/
|
||||
/^HAVE_FCHOWNAT *=/s/@HAVE_FCHOWNAT@/0/
|
||||
/^HAVE_FDATASYNC *=/s/@HAVE_FDATASYNC@/0/
|
||||
/^HAVE_FSEEKO *=/s/@HAVE_FSEEKO@/0/
|
||||
/^HAVE_FSTATAT *=/s/@HAVE_FSTATAT@/0/
|
||||
/^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/
|
||||
|
|
@ -351,11 +368,16 @@ am__cd = cd
|
|||
/^HAVE_NANOSLEEP *=/s/@HAVE_NANOSLEEP@/0/
|
||||
/^HAVE_OS_H *=/s/@HAVE_OS_H@/0/
|
||||
/^HAVE_PIPE *=/s/@HAVE_PIPE@/0/
|
||||
/^HAVE_PCLOSE *=/s/@HAVE_PCLOSE@/1/
|
||||
/^HAVE_PIPE2 *=/s/@HAVE_PIPE2@/0/
|
||||
/^HAVE_POPEN *=/s/@HAVE_POPEN@/1/
|
||||
/^HAVE_POSIX_SIGNALBLOCKING *=/s/@HAVE_POSIX_SIGNALBLOCKING@/1/
|
||||
/^HAVE_PREAD *=/s/@HAVE_PREAD@/0/
|
||||
/^HAVE_PTSNAME *=/s/@HAVE_PTSNAME@/0/
|
||||
/^HAVE_PTHREAD_SIGMASK *=/s/@HAVE_PTHREAD_SIGMASK@/0/
|
||||
/^HAVE_PWRITE *=/s/@HAVE_PWRITE@/0/
|
||||
/^HAVE_RANDOM_H *=/s/@HAVE_RANDOM_H@/1/
|
||||
/^HAVE_RAISE *=/s/@HAVE_RAISE@/1/
|
||||
/^HAVE_RANDOM_R *=/s/@HAVE_RANDOM_R@/0/
|
||||
/^HAVE_READLINK *=/s/@HAVE_READLINK@/0/
|
||||
/^HAVE_READLINKAT *=/s/@HAVE_READLINKAT@/0/
|
||||
|
|
@ -363,15 +385,20 @@ am__cd = cd
|
|||
/^HAVE_RENAMEAT *=/s/@HAVE_RENAMEAT@/0/
|
||||
/^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/
|
||||
/^HAVE_SETENV *=/s/@HAVE_SETENV@/1/
|
||||
/^HAVE_SIGACTION *=/s/@HAVE_SIGACTION@/1/
|
||||
/^HAVE_SIGHANDLER_T *=/s/@HAVE_SIGHANDLER_T@/0/
|
||||
/^HAVE_SIGINFO_T *=/s/@HAVE_SIGINFO_T@/0/
|
||||
/^HAVE_SIGNED_SIG_ATOMIC_T *=/s/@HAVE_SIGNED_SIG_ATOMIC_T@/1/
|
||||
/^HAVE_SIGNED_WCHAR_T *=/s/@HAVE_SIGNED_WCHAR_T@/0/
|
||||
/^HAVE_SIGNED_WINT_T *=/s/@HAVE_SIGNED_WINT_T@/1/
|
||||
/^HAVE_SIGSET_T *=/s/@HAVE_SIGSET_T@/1/
|
||||
/^HAVE_SLEEP *=/s/@HAVE_SLEEP@/1/
|
||||
/^HAVE_STDINT_H *=/s/@HAVE_STDINT_H@/HAVE_STDINT_H/
|
||||
/^HAVE_STRPTIME *=/s/@HAVE_STRPTIME@/0/
|
||||
/^HAVE_STRTOD *=/s/@HAVE_STRTOD@/1/
|
||||
/^HAVE_STRTOLL *=/s/@HAVE_STRTOLL@/1/
|
||||
/^HAVE_STRTOULL *=/s/@HAVE_STRTOULL@/1/
|
||||
/^HAVE_STRUCT_SIGACTION_SA_SIGACTION *=/s/@HAVE_STRUCT_SIGACTION_SA_SIGACTION@/0/
|
||||
/^HAVE_STRUCT_RANDOM_DATA *=/s/@HAVE_STRUCT_RANDOM_DATA@/0/
|
||||
/^HAVE_SYMLINK *=/s/@HAVE_SYMLINK@/1/
|
||||
/^HAVE_SYMLINKAT *=/s/@HAVE_SYMLINKAT@/0/
|
||||
|
|
@ -381,6 +408,7 @@ am__cd = cd
|
|||
/^HAVE_SYS_PARAM_H *=/s/@HAVE_SYS_PARAM_H@/1/
|
||||
/^HAVE_SYS_TYPES_H *=/s/@HAVE_SYS_TYPES_H@/1/
|
||||
/^HAVE_TIMEGM *=/s/@HAVE_TIMEGM@/0/
|
||||
/^HAVE_TYPE_VOLATILE_SIG_ATOMIC_T *=/s/@HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@/1/
|
||||
/^HAVE_UNISTD_H *=/s/@HAVE_UNISTD_H@/1/
|
||||
/^HAVE_UNLINKAT *=/s/@HAVE_UNLINKAT@/0/
|
||||
/^HAVE_UNLOCKPT *=/s/@HAVE_UNLOCKPT@/0/
|
||||
|
|
@ -398,11 +426,14 @@ am__cd = cd
|
|||
/^INCLUDE_NEXT_AS_FIRST_DIRECTIVE *=/s/@[^@\n]*@/include_next/
|
||||
/^LDFLAGS *=/s/@[^@\n]*@//
|
||||
/^LD_FIRSTFLAG *=/s/@[^@\n]*@//
|
||||
/^LIB_PTHREAD *=/s/@[^@\n]*@//
|
||||
/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@//
|
||||
/^LIBS *=/s/@[^@\n]*@//
|
||||
/^MAKEINFO *=/s/@MAKEINFO@/makeinfo/
|
||||
# MKDIR_P lines are edited further below
|
||||
/^MKDIR_P *=/s/@MKDIR_P@//
|
||||
/^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
|
||||
/^NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H *=/s/@[^@\n]*@/<signal.h>/
|
||||
/^NEXT_AS_FIRST_DIRECTIVE_STDARG_H *=/s/@[^@\n]*@//
|
||||
/^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@//
|
||||
/^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
|
||||
|
|
@ -413,6 +444,7 @@ am__cd = cd
|
|||
/^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@/<unistd.h>/
|
||||
/^NEXT_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/
|
||||
/^NEXT_STDARG_H *=/s/@[^@\n]*@//
|
||||
/^NEXT_SIGNAL_H *=/s/@[^@\n]*@/<signal.h>/
|
||||
/^NEXT_STDDEF_H *=/s/@[^@\n]*@//
|
||||
/^NEXT_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/
|
||||
/^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/
|
||||
|
|
@ -435,6 +467,7 @@ am__cd = cd
|
|||
/^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/
|
||||
/^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/
|
||||
/^REPLACE_FCLOSE *=/s/@REPLACE_FCLOSE@/0/
|
||||
/^REPLACE_FDOPEN *=/s/@REPLACE_FDOPEN@/0/
|
||||
/^REPLACE_FFLUSH *=/s/@REPLACE_FFLUSH@/0/
|
||||
/^REPLACE_FOPEN *=/s/@REPLACE_FOPEN@/0/
|
||||
/^REPLACE_FPRINTF *=/s/@REPLACE_FPRINTF@/0/
|
||||
|
|
@ -473,9 +506,11 @@ am__cd = cd
|
|||
/^REPLACE_POPEN *=/s/@REPLACE_POPEN@/0/
|
||||
/^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/
|
||||
/^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/
|
||||
/^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/0/
|
||||
/^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/
|
||||
/^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/
|
||||
/^REPLACE_READ *=/s/@REPLACE_READ@/0/
|
||||
/^REPLACE_RAISE *=/s/@REPLACE_RAISE@/0/
|
||||
/^REPLACE_READLINK *=/s/@REPLACE_READLINK@/0/
|
||||
/^REPLACE_REALLOC *=/s/@REPLACE_REALLOC@/0/
|
||||
/^REPLACE_REALPATH *=/s/@REPLACE_REALPATH@/0/
|
||||
|
|
@ -510,6 +545,7 @@ am__cd = cd
|
|||
/^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/
|
||||
/^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@//
|
||||
/^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/
|
||||
/^ALLOCA_H *=/s/@[^@\n]*@/alloca.h/
|
||||
/^STDBOOL_H *=/s/@[^@\n]*@//
|
||||
/^STDARG_H *=/s/@[^@\n]*@//
|
||||
/^STDDEF_H *=/s/@[^@\n]*@//
|
||||
|
|
@ -522,7 +558,7 @@ am__cd = cd
|
|||
/^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
|
||||
/am__append_1 *=.*gettext\.h/s/@[^@\n]*@/\#/
|
||||
/am__append_2 *=.*verify\.h/s/@[^@\n]*@//
|
||||
/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o sha1.o/
|
||||
/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o pthread_sigmask.o/
|
||||
/^BUILT_SOURCES *=/s/ *inttypes\.h//
|
||||
/^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)//
|
||||
/^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)//
|
||||
|
|
@ -560,6 +596,8 @@ s/^ -*test -z.*|| rm/ -rm/
|
|||
s/@echo /@djecho/
|
||||
#
|
||||
# Fix the recipes for header files
|
||||
s/^@GL_GENERATE_ALLOCA_H_TRUE@//
|
||||
s/^@GL_GENERATE_ALLOCA_H_FALSE@/\#/
|
||||
s/^@GL_GENERATE_STDBOOL_H_TRUE@/\#/
|
||||
s/^@GL_GENERATE_STDBOOL_H_FALSE@//
|
||||
s/^@GL_GENERATE_STDARG_H_TRUE@/\#/
|
||||
|
|
@ -574,6 +612,9 @@ arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h\
|
|||
/^cxxdefs\.h:/,/^[ ][ ]*mv /c\
|
||||
cxxdefs.h: $(top_srcdir)/build-aux/snippet/cxxdefs.h\
|
||||
sed -n -e '/_GL_CXXDEFS/,$$p' < $(top_srcdir)/build-aux/snippet/cxxdefs.h > $@
|
||||
/^warn-on-use\.h:/,/^[ ][ ]*mv /c\
|
||||
warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h\
|
||||
sed -n -e '/^.ifndef/,$$p' < $(top_srcdir)/build-aux/snippet/warn-on-use.h > $@
|
||||
s/^ [ ]*{ echo \(.*\); \\/ djecho \1 > $@-t/
|
||||
s/^ [ ]*{ echo \(.*\) && \\/ djecho \1 > $@-t/
|
||||
s/ \&\& \\ *$//
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2011-09-29 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined,
|
||||
use EDOM.
|
||||
|
||||
2011-09-28 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* xdisp.c (compute_display_string_end): If there's no display
|
||||
|
|
|
|||
|
|
@ -1844,7 +1844,11 @@ snprintf (char *buf, size_t bufsize, char const *format, ...)
|
|||
|
||||
if (INT_MAX < nbytes)
|
||||
{
|
||||
#ifdef EOVERFLOW
|
||||
errno = EOVERFLOW;
|
||||
#else
|
||||
errno = EDOM;
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
return nbytes;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue