1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-20 04:30:55 -08:00
Commit graph

6 commits

Author SHA1 Message Date
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Eli Zaretskii
0d23c240ea Adapt the MS-DOS build to the latest changes.
msdos/mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not
 bootstrap-clean (which doesn't exist).
 msdos/inttypes.h (PRIuMAX) [__DJGPP__ < 2.04]: Define to "llu".
 msdos/sedleim.inp (MKDIR_P): Edit to DOS "md" command.
 msdos/sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty.
 Remove lines that invoke PAXCTL.
 (clean): Fix recipe not to run Unixy shell commands.
 msdos/sed2v2.inp (GETTIMEOFDAY_TIMEZONE): Edit to 'struct timezone'.
 (HAVE_STRNCASECMP): Edit to 1.
 msdos/sed3v2.inp (LIB_CLOCK_GETTIME): Edit to empty.
 (C_SWITCH_SYSTEM): Add "-I../msdos".
 msdos/sedlibmk.inp (GNULIB_GETTIMEOFDAY, GNULIB_PSELECT)
 (GNULIB_SELECT, HAVE_STRUCT_TIMEVAL, HAVE_SYS_SELECT_H)
 (HAVE_SYS_TIME_H, NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H)
 (NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H, NEXT_SYS_SELECT_H)
 (NEXT_SYS_TIME_H, REPLACE_GETTIMEOFDAY, REPLACE_PSELECT)
 (REPLACE_STRUCT_TIMEVAL): Edit to appropriate values.
 (BUILT_SOURCES): Edit out sys/select.h and sys/time.h.
 (mostlyclean-local, distclean-generic): Fix recipe not to run
 Unixy shell commands.

 src/sysselect.h [DOS_NT]: Don't include sys/select.h.
 src/s/ms-w32.h (select, pselect): Don't define here, they are
 defined in sysselect.h
 src/sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select.
 src/sysdep.c: Don't include dos.h and dosfns.h.
 src/process.c (sys_select):
 src/msdos.c (sys_select): Accept one more argument and ignore it.
 src/msdos.c (event_timestamp, sys_select): Use gnulib's gettime;
 adapt data types and code to that.
 src/dosfns.c:
 src/msdos.c (gettime, settime): Define away the prototypes in dos.h,
 which clashes with the gnulib function of the same name.

 lisp/emacs-lisp/timer.el (timer-until): Subtract results of
 float-time, instead of taking float-time of the result of
 time-subtract, since float-time signals an error for negative time
 arguments.
2012-06-30 18:32:51 +03:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Eli Zaretskii
31bed48620 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.
2011-09-29 15:00:18 +03:00
Eli Zaretskii
75c0d28a6a Adapt MS-DOS configury to latest changes.
msdos/inttypes.h: Include stdint.h.
 (uintmax_t): Don't define, it is defined in stdint.h.
 msdos/sedlibmk.inp (am__append_1): Edit to comment out.
 (am__append_2): Edit to expose.
 (NEXT_AS_FIRST_DIRECTIVE_STDARG_H, NEXT_STDARG_H, STDARG_H): Edit
 to empty.
 (@GL_GENERATE_STDARG_H_TRUE@, @GL_GENERATE_STDARG_H_FALSE@): Edit
 to comment out corresponding lines.
2011-05-07 13:24:55 +03:00
Eli Zaretskii
8db90b7394 Adapt the MSDOS build to latest changes.
msdos/inttypes.h: New file.
 msdos/sed2v2.inp (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX)
 (HAVE_STRTOULL, HAVE_STRTOULL): Define to 1.
 src/sedlibmk.inp (BUILT_SOURCES): Edit out inttypes.h.
 src/sed1v2.inp (CPPFLAGS): Edit to "-I../msdos".
 Add ../msdos/inttypes.h to prerequisites of lread.o.
 src/dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
 rather than `XVECTOR (FOO)->size'.
2011-04-30 13:31:17 +03:00