summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1996-03-30 13:15:50 +0000
committerJim Meyering <jim@meyering.net>1996-03-30 13:15:50 +0000
commit488b6822ba8a60197094d8a368de2942f0e34fc3 (patch)
tree60652f56362a517af8d359c2f9c4b634eaf4f0d4
parentf39b11912d062305ebd79f1ef6a94239ba36b6b8 (diff)
downloadidutils-488b6822ba8a60197094d8a368de2942f0e34fc3.tar.gz
idutils-488b6822ba8a60197094d8a368de2942f0e34fc3.tar.bz2
idutils-488b6822ba8a60197094d8a368de2942f0e34fc3.zip
update from gettext-0.10.10.
-rw-r--r--intl/ChangeLog15
-rw-r--r--intl/Makefile.in2
-rw-r--r--intl/VERSION2
-rw-r--r--intl/finddomain.c8
4 files changed, 21 insertions, 6 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog
index a351333..b9b1db9 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,6 +1,19 @@
+Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware>
+
+ * finddomain.c: Include <ctype.h>. Reported by Roland McGrath.
+
+Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware>
+
+ * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
+ with external declaration.
+
+Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware>
+
+ * Makefile.in (all-no): Rename from all_no.
+
Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware>
- * gettextP.h [loaded_domain]: Array Successor must now contain up
+ * gettextP.h [loaded_domain]: Array `successor' must now contain up
to 63 elements (because of codeset name normalization).
* finddomain.c: Implement codeset name normalization.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index d98f9f5..db12128 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -32,7 +32,7 @@ includedir = $(prefix)/include
datadir = $(prefix)/@DATADIRNAME@
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext
+gettextsrcdir = @datadir@/gettext
aliaspath = $(localedir):.
subdir = intl
diff --git a/intl/VERSION b/intl/VERSION
index f8d8314..656752b 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.6
+GNU gettext library from gettext-0.10.10
diff --git a/intl/finddomain.c b/intl/finddomain.c
index d1669f4..e41833e 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
# include <config.h>
#endif
+#include <ctype.h>
#include <errno.h>
#include <stdio.h>
#include <sys/types.h>
@@ -63,7 +64,7 @@ void free ();
/* Rename the non ANSI C functions. This is required by the standard
because some ANSI C functions will require linking with this object
file and the name space must not be polluted. */
-# define stpcpy __stpcpy
+# define stpcpy(dest, src) __stpcpy(dest, src)
#endif
/* Encoding of locale name parts. */
@@ -102,7 +103,8 @@ static const char *normalize_codeset PARAMS ((const char *codeset));
/* Substitution for systems lacking this function in their C library. */
#if !_LIBC && !HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
+static char *stpcpy__ PARAMS ((char *dest, const char *src));
+# define stpcpy(dest, src) stpcpy__ (dest, src)
#endif
@@ -562,7 +564,7 @@ normalize_codeset (codeset)
to be defined. */
#if !_LIBC && !HAVE_STPCPY
static char *
-stpcpy (dest, src)
+stpcpy__ (dest, src)
char *dest;
const char *src;
{