X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstpncpy.h;h=1ecb3e82c04d010a0674b82568a65fb916de6fa3;hb=4a6f6ccf4f28947ff868115b73434a9c5af32727;hp=a457ee9d94699030a7eb4eb56c321a78ac05956f;hpb=1080617a7d04cdf1a1d3b1e390859af371d485d7;p=gnulib.git

diff --git a/lib/stpncpy.h b/lib/stpncpy.h
index a457ee9d9..1ecb3e82c 100644
--- a/lib/stpncpy.h
+++ b/lib/stpncpy.h
@@ -1,5 +1,5 @@
 /* String copying.
-   Copyright (C) 1995, 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2005 Free Software Foundation, Inc.
 
    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
@@ -13,24 +13,35 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _STPNCPY_H
 #define _STPNCPY_H
 
-#if HAVE_STPNCPY
-
-/* Get stpncpy() declaration.  */
 #include <string.h>
 
-#else
 
-#include <stddef.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if !HAVE_STPNCPY
+
+/* When not using the GNU libc we use the stpncpy implementation we
+   provide here.  */
+#define stpncpy gnu_stpncpy
 
-/* Copy no more than N characters of SRC to DST, returning the address of
-   the last character written into DST.  */
+/* Copy no more than N bytes of SRC to DST, returning a pointer past the
+   last non-NUL byte written into DST.  */
 extern char *stpncpy (char *dst, const char *src, size_t n);
 
 #endif
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _STPNCPY_H */