diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2004-12-03 07:10:19 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2004-12-03 07:10:19 +0000 |
| commit | f1258370306ccbfddb425a268138dabf5f18ebd6 (patch) | |
| tree | 1153d936d9c6eb07a464c9e73dac5a43038ede4e | |
| parent | 5a6d8bdbb4dee335ac4611737c5cbbe65b12bf82 (diff) | |
| download | coreutils-f1258370306ccbfddb425a268138dabf5f18ebd6.tar.xz | |
Import from gnulib.
| -rw-r--r-- | config/config.sub | 6 | ||||
| -rw-r--r-- | config/texinfo.tex | 6 | ||||
| -rw-r--r-- | lib/mktime.c | 3 | ||||
| -rw-r--r-- | m4/restrict.m4 | 7 |
4 files changed, 19 insertions, 3 deletions
diff --git a/config/config.sub b/config/config.sub index c5a77c387..0f84ac2c5 100644 --- a/config/config.sub +++ b/config/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-11-17' +timestamp='2004-11-30' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -1033,6 +1033,10 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; diff --git a/config/texinfo.tex b/config/texinfo.tex index 44c152a5e..c93912a05 100644 --- a/config/texinfo.tex +++ b/config/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{2004-11-19.19} +\def\texinfoversion{2004-11-25.16} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software @@ -1730,9 +1730,13 @@ where each line of input produces a line of output.} \let\dfn=\smartslanted \let\emph=\smartitalic +% @b, explicit bold. \def\b#1{{\bf #1}} \let\strong=\b +% @sansserif, explicit sans. +\def\sansserif#1{{\sf #1}} + % We can't just use \exhyphenpenalty, because that only has effect at % the end of a paragraph. Restore normal hyphenation at the end of the % group within which \nohyphenation is presumably called. diff --git a/lib/mktime.c b/lib/mktime.c index b3d90824f..16f5b9a5a 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -462,8 +462,9 @@ __mktime_internal (struct tm *tp, t2 = t1 + sec_adjustment; if (((t1 < t) != (sec_requested < 0)) | ((t2 < t1) != (sec_adjustment < 0)) - | ! (*convert) (&t, &tm)) + | ! (*convert) (&t2, &tm)) return -1; + t = t2; } *tp = tm; diff --git a/m4/restrict.m4 b/m4/restrict.m4 index 634293892..c8407782d 100644 --- a/m4/restrict.m4 +++ b/m4/restrict.m4 @@ -1,4 +1,11 @@ #serial 1002 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + # This macro can be removed once we can rely on Autoconf 2.57a or later, # since we can then use its AC_C_RESTRICT. |