(vc-dir-deduce-fileset): Make the error message more explicit.

[bpt/emacs.git] / src / strftime.c

diff --git a/src/strftime.c b/src/strftime.c
index 4ca6023..7a9506e 100644 (file)
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,2003
-             Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+                 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,19 +8,19 @@
    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,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   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.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -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) */
@@ -1491,3 +1492,6 @@ emacs_strftimeu (s, maxsize, format, tp, ut)
   return my_strftime (s, maxsize, format, tp, ut, 0);
 }
 #endif
+
+/* arch-tag: 662bc9c4-f8e2-41b6-bf96-b8346d0ce0d8
+   (do not change this comment) */