diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-06-22 14:17:42 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-06-22 14:17:42 -0700 |
| commit | d35af63cd671563fd188c3b0a1ef30067027c7aa (patch) | |
| tree | c9e01847ccf788e23794684da9331c3e0defd0d3 /admin | |
| parent | f143bfe38b43ad0a9d817f05c25e418982dca06f (diff) | |
| download | emacs-d35af63cd671563fd188c3b0a1ef30067027c7aa.tar.gz | |
Support higher-resolution time stamps.
Fixes: debbugs:9000
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/CPP-DEFINES | 2 | ||||
| -rw-r--r-- | admin/ChangeLog | 15 | ||||
| -rwxr-xr-x | admin/merge-gnulib | 14 |
3 files changed, 24 insertions, 7 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index e032ef87a40..70245a0804e 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -160,11 +160,9 @@ HAVE_SYS_SYSTEMINFO_H HAVE_SYS_TIMEB_H HAVE_SYS_TIME_H HAVE_TCATTR -HAVE_TIMEVAL HAVE_TM_ZONE HAVE_TZSET HAVE_UNISTD_H -HAVE_UTIMES HAVE_UTIME_H HAVE_WINDOW_SYSTEM HAVE_WORKING_VFORK diff --git a/admin/ChangeLog b/admin/ChangeLog index e3b35906ace..ec6448dbeee 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,18 @@ +2012-06-22 Paul Eggert <eggert@cs.ucla.edu> + + Support higher-resolution time stamps (Bug#9000). + * merge-gnulib (GNULIB_MODULES): Add dtotimespec, gettime, + gettimeofday, pselect, stat-time, sys_time, time, timespec-add, + timespec-sub, utimens. + (GNULIB_TOOL_FLAGS): Add --avoid=select --avoid=sigprocmask. + This trims down the gnulib import, from the very latest gnulib. + Emacs does its own implementation of 'select' and 'sigprocmask' + on Windows, and it assumes 'select' and 'sigprocmask' on non-Windows + hosts, so it doesn't need these modules. + Similarly, avoid errno, fcntl, fcntl-h, fstat, and sys_types, as + these gnulib modules are only for Windows porting and Emacs ports + to Windows in a different way. + 2012-06-13 Andreas Schwab <schwab@linux-m68k.org> * make-emacs: Rename --union-type to --check-lisp-type. Define diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 7f91b788f40..d33807551d6 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -28,16 +28,20 @@ GNULIB_URL=git://git.savannah.gnu.org/gnulib.git GNULIB_MODULES=' alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 - dtoastr dup2 - filemode getloadavg getopt-gnu ignore-value intprops largefile lstat - manywarnings mktime pthread_sigmask readlink - socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat + dtoastr dtotimespec dup2 + filemode getloadavg getopt-gnu gettime gettimeofday + ignore-value intprops largefile lstat + manywarnings mktime pselect pthread_sigmask readlink + socklen stat-time stdarg stdio strftime strtoimax strtoumax symlink sys_stat + sys_time time timespec-add timespec-sub utimens warnings ' GNULIB_TOOL_FLAGS=' + --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow - --avoid=raise --avoid=threadlib + --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types + --avoid=threadlib --conditional-dependencies --import --no-changelog --no-vc-files --makefile-name=gnulib.mk ' |