diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-09 15:21:44 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-09 15:22:37 -0800 |
| commit | 7668717d6fecd610d71b54a33708038b2ede8cce (patch) | |
| tree | cb635acfc8273c0adf5ef567e57de345244eb76f /lib/stat-time.h | |
| parent | 9e4d523427782ea4e49f4f13b2b99b09660516cc (diff) | |
| download | emacs-7668717d6fecd610d71b54a33708038b2ede8cce.tar.gz emacs-7668717d6fecd610d71b54a33708038b2ede8cce.tar.bz2 emacs-7668717d6fecd610d71b54a33708038b2ede8cce.zip | |
Merge from Gnulib
This incorporates:
2018-01-05 maint: Add encoding marker for Emacs to non-ASCII sources
2018-01-04 update-copyright: Handle use of ©
2018-01-04 pthread_sigmask: Avoid compilation error on mingw
2018-01-02 stat-time: silence -Wunused-parameter regression
* build-aux/config.guess, build-aux/config.sub:
* build-aux/update-copyright, doc/misc/texinfo.tex, lib/gnulib.mk.in:
* lib/md5.c, lib/md5.h, lib/sha1.c, lib/sha1.h, lib/sha256.c:
* lib/sha256.h, lib/sha512.c, lib/sha512.h, lib/signal.in.h:
* lib/stat-time.h: Copy from Gnulib, or regenerate.
Diffstat (limited to 'lib/stat-time.h')
| -rw-r--r-- | lib/stat-time.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/stat-time.h b/lib/stat-time.h index 5f8bf4e126f..104f5376682 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -102,15 +102,13 @@ get_stat_mtime_ns (struct stat const *st) /* Return the nanosecond component of *ST's birth time. */ _GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE -get_stat_birthtime_ns (struct stat const *st) +get_stat_birthtime_ns (struct stat const *st _GL_UNUSED) { # if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC return STAT_TIMESPEC (st, st_birthtim).tv_nsec; # elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC return STAT_TIMESPEC_NS (st, st_birthtim); # else - /* Avoid a "parameter unused" warning. */ - (void) st; return 0; # endif } @@ -160,7 +158,7 @@ get_stat_mtime (struct stat const *st) /* Return *ST's birth time, if available; otherwise return a value with tv_sec and tv_nsec both equal to -1. */ _GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE -get_stat_birthtime (struct stat const *st) +get_stat_birthtime (struct stat const *st _GL_UNUSED) { struct timespec t; @@ -184,8 +182,6 @@ get_stat_birthtime (struct stat const *st) /* Birth time is not supported. */ t.tv_sec = -1; t.tv_nsec = -1; - /* Avoid a "parameter unused" warning. */ - (void) st; #endif #if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \ @@ -212,7 +208,7 @@ get_stat_birthtime (struct stat const *st) errno to EOVERFLOW if normalization overflowed. This function is intended to be private to this .h file. */ _GL_STAT_TIME_INLINE int -stat_time_normalize (int result, struct stat *st) +stat_time_normalize (int result, struct stat *st _GL_UNUSED) { #if defined __sun && defined STAT_TIMESPEC if (result == 0) |