X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstpncpy.c;h=62dad70337e6c5816d06b38fca0487a8da2c3069;hb=22076266cedbd153e35fd6d47378e9255ab5499e;hp=3f7473f946c80ca22541df32a836f86ea74dfda0;hpb=55da53d0db0c7a9fd82b2abc809560b3089df6a5;p=gnulib.git

diff --git a/lib/stpncpy.c b/lib/stpncpy.c
index 3f7473f94..62dad7033 100644
--- a/lib/stpncpy.c
+++ b/lib/stpncpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-1997, 2002-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005 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.
@@ -15,7 +15,7 @@
 
    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,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
 /* This is almost copied from strncpy.c, written by Torbjorn Granlund.  */
@@ -27,15 +27,6 @@
 /* Specification.  */
 #include "stpncpy.h"
 
-#if !HAVE_STPNCPY
-
-#ifndef _LIBC
-/* We cannot generally use the name 'stpncpy' since AIX 4 defines an unusable
-   variant of the function but we cannot use it.  */
-# undef stpncpy
-# define stpncpy gnu_stpncpy
-#endif
-
 #ifndef weak_alias
 # define __stpncpy stpncpy
 #endif
@@ -102,5 +93,3 @@ __stpncpy (char *dest, const char *src, size_t n)
 #ifdef weak_alias
 weak_alias (__stpncpy, stpncpy)
 #endif
-
-#endif