NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / stpcpy.c

diff --git a/lib/stpcpy.c b/lib/stpcpy.c
index a01636c..880a706 100644 (file)
--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -1,12 +1,13 @@
 /* stpcpy.c -- copy a string and return pointer to end of new string
 /* stpcpy.c -- copy a string and return pointer to end of new string

-   Copyright (C) 1992, 1995, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2014 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@prep.ai.mit.edu.
 
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 

-   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,


@@ -15,18 +16,16 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   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 <string.h>
 
 #undef __stpcpy
 
 #include <string.h>
 
 #undef __stpcpy

-#undef stpcpy
+#ifdef _LIBC
+# undef stpcpy
+#endif

 
 #ifndef weak_alias
 # define __stpcpy stpcpy
 
 #ifndef weak_alias
 # define __stpcpy stpcpy