[bug-gnulib] stpncpy.c simplification

[Bruno Haible]

A merge from gettext:

2005-01-06  Bruno Haible  <address@hidden>

        * stpncpy.m4 (gl_FUNC_STPNCPY): Rename stpncpy to gnu_stpncpy here.
        * stpncpy.c: Remove HAVE_STPNCPY and gnu_stpncpy renaming, redundant
        because stpncpy.m4 takes care of it.

diff -r -c3 --exclude='*.po*' --exclude='*.info*' --exclude='*.html' 
--exclude=Makefile.in --exclude=aclocal.m4 --exclude=configure 
--exclude='po-*-gen*.[ch]' --exclude='*.o' --exclude='*.lo' --exclude='*.gmo' 
--exclude=ABOUT-NLS --exclude=CVS gettext-cvs/gettext-tools/m4/stpncpy.m4 
gettext-5/gettext-tools/m4/stpncpy.m4
*** gettext-cvs/gettext-tools/m4/stpncpy.m4     Fri Jan  7 02:34:34 2005
--- gettext-5/gettext-tools/m4/stpncpy.m4       Sat Jan 15 02:11:28 2005
***************
*** 1,5 ****
! # stpncpy.m4 serial 1
! dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
  dnl This file is free software, distributed under the terms of the GNU
  dnl General Public License.  As a special exception to the GNU General
  dnl Public License, this file may be distributed as part of a program
--- 1,5 ----
! # stpncpy.m4 serial 2
! dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
  dnl This file is free software, distributed under the terms of the GNU
  dnl General Public License.  As a special exception to the GNU General
  dnl Public License, this file may be distributed as part of a program
***************
*** 51,56 ****
--- 51,58 ----
      AC_DEFINE(HAVE_STPNCPY, 1,
        [Define if you have the stpncpy() function and it works.])
    else
+     AC_DEFINE([stpncpy], [gnu_stpncpy],
+       [Define to a replacement function name for stpncpy().])
      AC_LIBOBJ([stpncpy])
      gl_PREREQ_STPNCPY
    fi
diff -r -c3 --exclude=ChangeLog GNULIB/gnulib-20050105/lib/stpncpy.c 
/packages/gettext/gettext-work/gettext-cvs/gettext-tools/lib/stpncpy.c
*** GNULIB/gnulib-20050105/lib/stpncpy.c        2003-09-26 17:22:47.000000000 
+0200
--- /packages/gettext/gettext-work/gettext-cvs/gettext-tools/lib/stpncpy.c      
2005-01-08 01:30:13.000000000 +0100
***************
*** 1,4 ****
! /* Copyright (C) 1993, 1995-1997, 2002-2003 Free Software Foundation, Inc.
  
     NOTE: The canonical source of this file is maintained with the GNU C 
Library.
     Bugs can be reported to address@hidden
--- 1,4 ----
! /* 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 address@hidden
***************
*** 27,41 ****
  /* 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
--- 27,32 ----
***************
*** 102,106 ****
  #ifdef weak_alias
  weak_alias (__stpncpy, stpncpy)
  #endif
- 
- #endif
--- 93,95 ----