NEWS.stable: log cherry-pick [8b18afa]->[c948e19] sys_select: Avoid a syntax error...

[gnulib.git] / lib / strcspn.c

diff --git a/lib/strcspn.c b/lib/strcspn.c
index 46d7d36..e4d780e 100644 (file)
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,11 +1,12 @@
-/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006, 2009-2011 Free
+ * Software Foundation, Inc.

 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
 
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
 

-   This program is free software; you can redistribute it and/or modify it
+   This program is free software: you can redistribute it and/or modify it

    under the terms of the GNU General Public License as published by the
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any
+   Free Software Foundation; either version 3 of the License, or any

    later version.
 
    This program is distributed in the hope that it will be useful,
    later version.
 
    This program is distributed in the hope that it will be useful,


@@ -14,12 +15,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>

 
 #include <stddef.h>
 #include <string.h>
 
 #include <stddef.h>
 #include <string.h>