diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 30 | ||||
| -rwxr-xr-x | make-dist | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/deps.mk | 1 |
6 files changed, 19 insertions, 32 deletions
@@ -1,6 +1,18 @@ 2011-01-09 Paul Eggert <[email protected]> - Use gnulib ftoastr module. + Use gnulib's mktime module. + * Makefile.in (GNULIB_MODULES): Add mktime. + * configure.in: Remove code no longer needed, as gnulib now does it. + (AC_CHECK_FUNCS): Remove mktime. + (AC_FUNC_MKTIME, BROKEN_MKTIME): Remove. + (__restrict): Remove, as this now gets in the way of the C99 + support for 'restrict' pulled in by the gnulib mktime module. + Code should now use 'restrict' and not '__restrict". + (mktime): Remove. + * make-dist: Put gnulib-generated files arg-nonnull.h, c++defs.h, + and warn-on-use.h into the distribution. + + Use gnulib's ftoastr module. * Makefile.in (GNULIB_MODULES): Add ftoastr. Remove dummy. 2011-01-08 Paul Eggert <[email protected]> diff --git a/Makefile.in b/Makefile.in index 30692b46a7..b4cc82c708 100644 --- a/Makefile.in +++ b/Makefile.in @@ -330,7 +330,7 @@ $(gnulib_srcdir): # Update modules from gnulib, for maintainers, who should have it in # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools # as per $(gnulib_srcdir)/DEPENDENCIES. -GNULIB_MODULES = ftoastr +GNULIB_MODULES = ftoastr mktime GNULIB_TOOL_FLAGS = \ --import --no-changelog --no-vc-files --makefile-name=gnulib.mk sync-from-gnulib: $(gnulib_srcdir) diff --git a/configure.in b/configure.in index a267481c21..5ef67ce0e5 100644 --- a/configure.in +++ b/configure.in @@ -2632,7 +2632,7 @@ AC_SUBST(BLESSMAIL_TARGET) AC_CHECK_FUNCS(gethostname getdomainname dup2 \ rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \ random lrand48 logb frexp fmod rint cbrt ftime setsid \ -strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \ +strerror fpathconf select euidaccess getpagesize tzset setlocale \ utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \ __fpending mblen mbrlen mbsinit strsignal setitimer ualarm strchr strrchr \ sendto recvfrom getsockopt setsockopt getsockname getpeername \ @@ -2653,11 +2653,6 @@ fi AC_CHECK_HEADERS(sys/un.h) -AC_FUNC_MKTIME -if test "$ac_cv_func_working_mktime" = no; then - AC_DEFINE(BROKEN_MKTIME, 1, [Define to 1 if the mktime function is broken.]) -fi - AC_FUNC_GETLOADAVG AC_FUNC_FSEEKO @@ -3039,24 +3034,6 @@ AC_CHECK_TYPES(size_t) AC_TYPE_MBSTATE_T -dnl Restrict could probably be used effectively other than in regex.c. -AC_CACHE_CHECK([for C restrict keyword], emacs_cv_c_restrict, - [AC_TRY_COMPILE([void fred (int *restrict x);], [], - emacs_cv_c_restrict=yes, - [AC_TRY_COMPILE([void fred (int *__restrict x);], [], - emacs_cv_c_restrict=__restrict, - emacs_cv_c_restrict=no)])]) -case "$emacs_cv_c_restrict" in - yes) emacs_restrict=restrict;; - no) emacs_restrict="";; - *) emacs_restrict="$emacs_cv_c_restrict";; -esac -if test "$emacs_restrict" != __restrict; then - AC_DEFINE_UNQUOTED(__restrict, $emacs_restrict, - [Define to compiler's equivalent of C99 restrict keyword. - Don't define if equivalent is `__restrict'.]) -fi - AC_CACHE_CHECK([for C restricted array declarations], emacs_cv_c_restrict_arr, [AC_TRY_COMPILE([void fred (int x[__restrict]);], [], emacs_cv_c_restrict_arr=yes, emacs_cv_c_restrict_arr=no)]) @@ -3546,11 +3523,6 @@ AH_BOTTOM([ #endif #endif -/* Avoid link-time collision with system mktime if we will use our own. */ -#if ! HAVE_MKTIME || BROKEN_MKTIME -#define mktime emacs_mktime -#endif - #define my_strftime nstrftime /* for strftime.c */ /* These default definitions are good for almost all machines. @@ -288,6 +288,7 @@ ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir} ln mkinstalldirs config.sub config.guess install-sh ${tempdir} ln aclocal.m4 ${tempdir} ln compile depcomp missing ${tempdir} +ln arg-nonnull.h c++defs.h warn-on-use.h ${tempdir} echo "Creating subdirectories" for subdir in site-lisp \ diff --git a/src/ChangeLog b/src/ChangeLog index a7d7b87a9b..52eb207466 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-01-09 Paul Eggert <[email protected]> + Use gnulib's mktime module. + * deps.mk (mktime.o): Remove rule. + Use gnulib's ftoastr module. * print.c: Include ftoastr.h. (FLT_RADIX, DBL_MANT_DIG, DBL_DIG, DBL_MIN, DOUBLE_DIGITS_BOUND): diff --git a/src/deps.mk b/src/deps.mk index eebf98ec00..eb7dfedd3b 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -138,7 +138,6 @@ md5.o: md5.c md5.h $(config_h) minibuf.o: minibuf.c syntax.h frame.h window.h keyboard.h systime.h \ buffer.h commands.h character.h msdos.h $(INTERVALS_H) keymap.h \ termhooks.h lisp.h $(config_h) coding.h -mktime.o: mktime.c $(config_h) msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \ keyboard.h $(INTERVALS_H) buffer.h commands.h blockinput.h atimer.h \ |