From 7668717d6fecd610d71b54a33708038b2ede8cce Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 9 Jan 2018 15:21:44 -0800 Subject: Merge from Gnulib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- lib/gnulib.mk.in | 1 - lib/md5.c | 7 +++++++ lib/md5.h | 7 +++++++ lib/sha1.c | 7 +++++++ lib/sha1.h | 7 +++++++ lib/sha256.c | 7 +++++++ lib/sha256.h | 7 +++++++ lib/sha512.c | 7 +++++++ lib/sha512.h | 7 +++++++ lib/signal.in.h | 2 +- lib/stat-time.h | 10 +++------- 11 files changed, 60 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index ee9e6bd12e1..71c01e3e2a2 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -945,7 +945,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/lib/md5.c b/lib/md5.c index 8bdd4a7884b..9dc915e2cf0 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -469,3 +469,10 @@ md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx) ctx->D = D; } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/md5.h b/lib/md5.h index 4adfcdd9cfd..d89f819a97b 100644 --- a/lib/md5.h +++ b/lib/md5.h @@ -133,3 +133,10 @@ extern int __md5_stream (FILE *stream, void *resblock) __THROW; # endif #endif /* md5.h */ + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha1.c b/lib/sha1.c index 89a0f71e203..ce0f0b2e71f 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -434,3 +434,10 @@ sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx) } } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha1.h b/lib/sha1.h index 62c507bbdf0..b1db15da1e7 100644 --- a/lib/sha1.h +++ b/lib/sha1.h @@ -98,3 +98,10 @@ extern int sha1_stream (FILE *stream, void *resblock); # endif #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha256.c b/lib/sha256.c index 2f28fcd7100..85405b20fdf 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -577,3 +577,10 @@ sha256_process_block (const void *buffer, size_t len, struct sha256_ctx *ctx) } } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha256.h b/lib/sha256.h index ca06691241a..e3449864bb6 100644 --- a/lib/sha256.h +++ b/lib/sha256.h @@ -101,3 +101,10 @@ extern int sha224_stream (FILE *stream, void *resblock); # endif #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha512.c b/lib/sha512.c index d6a8ce181a1..8a6dd4e83ac 100644 --- a/lib/sha512.c +++ b/lib/sha512.c @@ -629,3 +629,10 @@ sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx) } } #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/sha512.h b/lib/sha512.h index 516e75b3013..6a0aadba02f 100644 --- a/lib/sha512.h +++ b/lib/sha512.h @@ -104,3 +104,10 @@ extern int sha384_stream (FILE *stream, void *resblock); # endif #endif + +/* + * Hey Emacs! + * Local Variables: + * coding: utf-8 + * End: + */ diff --git a/lib/signal.in.h b/lib/signal.in.h index 483413dc7f5..7d4927b828e 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -137,7 +137,7 @@ _GL_FUNCDECL_RPL (pthread_sigmask, int, _GL_CXXALIAS_RPL (pthread_sigmask, int, (int how, const sigset_t *new_mask, sigset_t *old_mask)); # else -# if !@HAVE_PTHREAD_SIGMASK@ +# if !(@HAVE_PTHREAD_SIGMASK@ || defined pthread_sigmask) _GL_FUNCDECL_SYS (pthread_sigmask, int, (int how, const sigset_t *new_mask, sigset_t *old_mask)); # endif 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) -- cgit v1.2.1