* progmodes/sh-script.el (sh-mode-map): Don't assume that skeleton is

[gnu-emacs] / src / strftime.c

diff --git a/src/strftime.c b/src/strftime.c
index 88a54b7bee4123d4df23d7b421bcca9636a1732a..7a9506e55d3e0125127e0780481396d8e5c2fe47 100644 (file)
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
@@ -7,17 +8,17 @@
    This file is part of the GNU Emacs.
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License
+   modify it under the terms of the GNU General Public License
    as published by the Free Software Foundation; either version 2, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   You should have received a copy of the GNU General Public
+   License along with the GNU C Library; see the file COPYING.  If not,
    write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
@@ -69,9 +70,9 @@ extern char *tzname[];
 #if DO_MULTIBYTE
 # if HAVE_MBRLEN
 #  include <wchar.h>
-#   ifdef HAVE_SYS__MBSTATE_H  /* previously tested __hpux */
-#     include <sys/_mbstate_t.h>
-#   endif
+#  ifdef HAVE_SYS__MBSTATE_T_H       /* previously tested __hpux */
+#   include <sys/_mbstate_t.h>
+#  endif
 #  if !defined (mbsinit) && !defined (HAVE_MBSINIT)
 #   define mbsinit(ps) 1
 #  endif /* !defined (mbsinit) && !defined (HAVE_MBSINIT) */