Define the alias differently.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 2534dfc1c769277892469fc1a875b02f56044ab9..3749a8d46b8e85fabac8ec60d91ddfafe9876803 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-28  Bruno Haible  <bruno@clisp.org>
+
+       * stpncpy.h (stpncpy): Define as a macro without arguments, so that
+       stpncpy.c uses it.
+
 2005-01-09  Bruno Haible  <bruno@clisp.org>
 
        * csharpcomp.sh.in (func_tmpdir): New function.

diff --git a/gettext-tools/lib/stpncpy.h b/gettext-tools/lib/stpncpy.h
index 6dc92a81324d993b9dc2ead31d4c69e3a2db47ab..6bcdbdd61379b032a37b887f37f693343c4b5c87 100644 (file)
--- a/gettext-tools/lib/stpncpy.h
+++ b/gettext-tools/lib/stpncpy.h
@@ -1,5 +1,5 @@
 /* String copying.
-   Copyright (C) 1995, 2001-2004 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
@@ -28,12 +28,13 @@ extern "C" {
 
 #if !HAVE_STPNCPY
 
-/* Copy no more than N bytes of SRC to DST, returning a pointer past the
-   last non-NUL byte written into DST.  */
 /* When not using the GNU libc we use the stpncpy implementation we
    provide here.  */
-extern char *gnu_stpncpy (char *dst, const char *src, size_t n);
-#define stpncpy(Dst, Src, N) gnu_stpncpy (Dst, Src, N)
+#define stpncpy gnu_stpncpy
+
+/* 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