From 06c2ec49462474205dbd79a5dbd96bf73367d949 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 5 Feb 2014 11:41:03 -0800 Subject: [PATCH] Merge from gnulib. This incorporates: 2014-01-23 pthread: work around winpthread header pollution on mingw * lib/time.in.h: Update from gnulib. * doc/misc/texinfo.tex: Update from texinfo. --- ChangeLog | 6 ++++++ doc/misc/ChangeLog | 4 ++++ doc/misc/texinfo.tex | 14 ++++++++++++-- lib/time.in.h | 11 ++--------- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index a00981c219e..67d32962001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-02-05 Paul Eggert + + Merge from gnulib, incorporating: + 2014-01-23 pthread: work around winpthread header pollution on mingw + * lib/time.in.h: Update from gnulib. + 2014-01-23 Paul Eggert Merge from gnulib, incorporating: diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0b79841256e..f1d06e0b1be 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-02-05 Paul Eggert + + * texinfo.tex: Update from gnulib. + 2014-02-05 Glenn Morris * epa.texi: Add indices. diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 704d66453f5..174e4abafda 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2014-01-16.10} +\def\texinfoversion{2014-01-30.15} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -4649,6 +4649,16 @@ end \definedummyword\verb \definedummyword\w \definedummyword\xref + % + % Consider: + % @macro mkind{arg1,arg2} + % @cindex \arg2\ + % @end macro + % @mkind{foo, bar} + % The space after the comma will end up in the temporary definition + % that we make for arg2 (see \parsemargdef ff.). We want all this to be + % expanded for the sake of the index, so we end up just seeing "bar". + \let\xeatspaces = \eatspaces } % \indexnofonts is used when outputting the strings to sort the index @@ -7474,7 +7484,7 @@ end % Parse the optional {params} list. Set up \paramno and \paramlist % so \defmacro knows what to do. Define \macarg.BLAH for each BLAH -% in the params list to some hook where the argument si to be expanded. If +% in the params list to some hook where the argument is to be expanded. If % there are less than 10 arguments that hook is to be replaced by ##N where N % is the position in that list, that is to say the macro arguments are to be % defined `a la TeX in the macro body. diff --git a/lib/time.in.h b/lib/time.in.h index 58dc5bf291b..81abdf46e0b 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -48,20 +48,13 @@ /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). Or they define it with the wrong member names or define it in - (e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the - pthreads-win32 library defines it in . */ + (e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it, + but the pthreads-win32 library defines it in . */ # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@ # if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ # include # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ # include -/* The pthreads-win32 also defines a couple of broken macros. */ -# undef asctime_r -# undef ctime_r -# undef gmtime_r -# undef localtime_r -# undef rand_r -# undef strtok_r # else # ifdef __cplusplus -- 2.39.2