Move the xasprintf function from the 'xerror' module to the 'xvasprintf'

module.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 8c794dccc9c24a6cc80e7864e29a39e4826ed24b..0f317d30c75acaf6dc523029c7d73d72eb9878bd 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,20 @@
+2006-04-30  Bruno Haible  <bruno@clisp.org>
+
+       * xvasprintf.h: New file, from gnulib.
+       * xvasprintf.c: New file, from gnulib.
+       * xasprintf.c: New file, from gnulib.
+       * xerror.h (xasprintf): Remove declaration.
+       * xerror.c: Don't include stdarg.h, error.h, exit.h, vasprintf.h,
+       gettext.h.
+       (_): Remove macro.
+       (xasprintf): Remove function.
+       * Makefile.am (libgettextlib_la_SOURCES): Add xvasprintf.h,
+       xvasprintf.c, xasprintf.c.
+       * Makefile.msvc (OBJECTS): Add xvasprintf.obj, xasprintf.obj.
+       (xvasprintf.obj, xasprintf.obj): New rules.
+       * Makefile.vms (OBJECTS): Add xvasprintf.obj, xasprintf.obj.
+       (xvasprintf.obj, xasprintf.obj): New rules.
+
 2006-05-01  Bruno Haible  <bruno@clisp.org>
 
        * javacomp.sh.in: Update for changed javacomp.m4.
@@ -1425,4 +1442,4 @@
        * Makefile.am (EXTRA_DIST): Add ChangeLog.0.
 
 
-See ChangeLog.0 for earlier changes.
+See ChangeLog.0 for earlier changes.
\ No newline at end of file

diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index 17077b65baf770eefff8fe6de701bcce75f95822..128c7d2ef7eb4437038e762ad45577bc03a4a23b 100644 (file)
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -83,7 +83,8 @@ libgettextlib_la_SOURCES = \
   xerror.h xerror.c \
   xreadlink.h xreadlink.c \
   xsetenv.h xsetenv.c \
-  xsize.h
+  xsize.h \
+  xvasprintf.h xvasprintf.c xasprintf.c
 
 # Sources that are compiled only on platforms that lack the functions.
 

diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc
index 20ad04b1c6f4b0cdfa6b61d851d011ab64f3f250..181a119bf77f6a16f92d33287404371150bcd70c 100644 (file)
--- a/gettext-tools/lib/Makefile.msvc
+++ b/gettext-tools/lib/Makefile.msvc
@@ -124,6 +124,7 @@ OBJECTS = \
   xallocsa.obj \
   xerror.obj \
   xsetenv.obj \
+  xvasprintf.obj xasprintf.obj \
   \
   error.obj \
   fnmatch.obj \
@@ -282,6 +283,12 @@ xerror.obj : xerror.c
 xsetenv.obj : xsetenv.c
        $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xsetenv.c
 
+xvasprintf.obj : xvasprintf.c
+       $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xvasprintf.c
+
+xasprintf.obj : xasprintf.c
+       $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xasprintf.c
+
 error.obj : error.c
        $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c error.c
 

diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms
index 88cf294d2e677a964234f511937e612adb2841e1..c0b403bb7b84794822d5e2b99688d09f3be666a1 100644 (file)
--- a/gettext-tools/lib/Makefile.vms
+++ b/gettext-tools/lib/Makefile.vms
@@ -82,6 +82,7 @@ OBJECTS = \
   xallocsa.obj, \
   xerror.obj, \
   xsetenv.obj, \
+  xvasprintf.obj, xasprintf.obj, \
   \
   error.obj, \
   fnmatch.obj, \
@@ -244,6 +245,12 @@ xerror.obj : xerror.c
 xsetenv.obj : xsetenv.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xsetenv.c
 
+xvasprintf.obj : xvasprintf.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xvasprintf.c
+
+xasprintf.obj : xasprintf.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xasprintf.c
+
 error.obj : error.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) error.c
 

diff --git a/gettext-tools/lib/xerror.c b/gettext-tools/lib/xerror.c
index 22370e40c2d96f58baa9cbd22793eb69a570ef5b..c8b327211b154b662fed73f774cdf8d8e9bb9463 100644 (file)
--- a/gettext-tools/lib/xerror.c
+++ b/gettext-tools/lib/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -27,31 +27,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 
-#include "error.h"
 #include "progname.h"
 #include "error-progname.h"
-#include "exit.h"
 #include "mbswidth.h"
-#include "vasprintf.h"
-#include "gettext.h"
-
-#define _(str) gettext (str)
-
-/* Format a message and return the freshly allocated resulting string.  */
-char *
-xasprintf (const char *format, ...)
-{
-  va_list args;
-  char *result;
-
-  va_start (args, format);
-  if (vasprintf (&result, format, args) < 0)
-    error (EXIT_FAILURE, 0, _("memory exhausted"));
-  va_end (args);
-  return result;
-}
 
 /* Emit a multiline warning to stderr, consisting of MESSAGE, with the
    first line prefixed with PREFIX and the remaining lines prefixed with

diff --git a/gettext-tools/lib/xerror.h b/gettext-tools/lib/xerror.h
index e6be4da7a926af597772415cc9e0839b38545730..4e539d892e30eaf7e13e1460db493fb0e66880a4 100644 (file)
--- a/gettext-tools/lib/xerror.h
+++ b/gettext-tools/lib/xerror.h
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -28,10 +28,6 @@ extern "C" {
 #endif
 
 
-/* Format a message and return the freshly allocated resulting string.  */
-extern char *xasprintf (const char *format, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
-
 /* Emit a multiline warning to stderr, consisting of MESSAGE, with the
    first line prefixed with PREFIX and the remaining lines prefixed with
    the same amount of spaces.  Reuse the spaces of the previous call if

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ba4d412eaab30948fac6a2e0794ac543d08acaad..8db1b543ef4ea1e9c7f89d34008dc1d2d6007607 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,37 @@
+2006-04-30  Bruno Haible  <bruno@clisp.org>
+
+       * msgfmt.c: Include xvasprintf.h.
+       * msginit.c: Likewise.
+       * msgl-cat.c: Likewise.
+       * msgl-charset.c: Likewise.
+       * po-xerror.c: Likewise.
+       * x-csharp.c: Likewise.
+       * x-glade.c: Likewise.
+       * x-python.c: Likewise.
+       * xgettext.c: Likewise.
+       * format-boost.c: Include xvasprintf.h instead of xerror.h.
+       * format-c.c: Likewise.
+       * format-csharp.c: Likewise.
+       * format-gcc-internal.c: Likewise.
+       * format-java.c: Likewise.
+       * format-lisp.c: Likewise.
+       * format-perl.c: Likewise.
+       * format-python.c: Likewise.
+       * format-qt.c: Likewise.
+       * format-scheme.c: Likewise.
+       * format-ycp.c: Likewise.
+       * msgexec.c: Likewise.
+       * msgl-check.c: Likewise.
+       * msgl-iconv.c: Likewise.
+       * open-po.c: Likewise.
+       * po-charset.c: Likewise.
+       * po-lex.c: Likewise.
+       * po-time.c: Likewise.
+       * read-po-abstract.c: Likewise.
+       * read-properties.c: Likewise.
+       * read-stringtable.c: Likewise.
+       * write-po.c: Likewise.
+
 2006-04-30  Bruno Haible  <bruno@clisp.org>
 
        * msginit.c (project_id, project_id_version, get_user_email): Close

diff --git a/gettext-tools/src/format-boost.c b/gettext-tools/src/format-boost.c
index ccf4f610166f4dada313944aeec4f58d7a4181cf..70f9d5eef8d2185366287c8d1836b69f227d32fd 100644 (file)
--- a/gettext-tools/src/format-boost.c
+++ b/gettext-tools/src/format-boost.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/format-c.c b/gettext-tools/src/format-c.c
index e31bebff3382b0f6cc5e3dc9212f7add7b4bb313..31d27bc811a66d339cdb3483305c772a87b36c70 100644 (file)
--- a/gettext-tools/src/format-c.c
+++ b/gettext-tools/src/format-c.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/format-csharp.c b/gettext-tools/src/format-csharp.c
index 966ede2633ca93af13c8728167be227d97e8acde..2fd759354689dae02bca48c5f0365e45507fbea7 100644 (file)
--- a/gettext-tools/src/format-csharp.c
+++ b/gettext-tools/src/format-csharp.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-gcc-internal.c b/gettext-tools/src/format-gcc-internal.c
index 43713aed8c633dbcb8ee2c087acc249e7c268aab..c3842f1b3497a8f3eeab0e200844909a0e5f54c9 100644 (file)
--- a/gettext-tools/src/format-gcc-internal.c
+++ b/gettext-tools/src/format-gcc-internal.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/format-java.c b/gettext-tools/src/format-java.c
index b7f6de1936fa888e498eaf9fb051b12b2767d82b..936297d102ced0db5f83747cc1da3afbe0d41634 100644 (file)
--- a/gettext-tools/src/format-java.c
+++ b/gettext-tools/src/format-java.c
@@ -29,7 +29,7 @@
 #include "c-ctype.h"
 #include "xalloc.h"
 #include "xallocsa.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c
index 4b746b2ec94c702736963c94e728346467ce2892..c43143943768b174861c2c88c42a24842a3c9cf1 100644 (file)
--- a/gettext-tools/src/format-lisp.c
+++ b/gettext-tools/src/format-lisp.c
@@ -27,7 +27,7 @@
 #include "c-ctype.h"
 #include "gcd.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "minmax.h"
 #include "gettext.h"

diff --git a/gettext-tools/src/format-perl.c b/gettext-tools/src/format-perl.c
index 20d6632a1f1ce345a5333ac1bdc959f3aafbd431..753981086ce88b547bc8ead7c4120bbf821557e1 100644 (file)
--- a/gettext-tools/src/format-perl.c
+++ b/gettext-tools/src/format-perl.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/format-python.c b/gettext-tools/src/format-python.c
index b86de591b85458fce53c4a551aee89dad9eadcb3..35012e35a34ae9976010fa2bbcbc5b4adf66086d 100644 (file)
--- a/gettext-tools/src/format-python.c
+++ b/gettext-tools/src/format-python.c
@@ -27,7 +27,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/format-qt.c b/gettext-tools/src/format-qt.c
index f4da230d00f7aa405d4c13686a7bd2ea11172e75..aa51a93c5ab150c0f07f4db91c6eed289ed545c5 100644 (file)
--- a/gettext-tools/src/format-qt.c
+++ b/gettext-tools/src/format-qt.c
@@ -25,7 +25,7 @@
 
 #include "format.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/format-scheme.c b/gettext-tools/src/format-scheme.c
index 7497a9284548ef0408d211caae428c4e0176e3d6..5005b02bc59cf0c489a23750341c1ae96e302e37 100644 (file)
--- a/gettext-tools/src/format-scheme.c
+++ b/gettext-tools/src/format-scheme.c
@@ -27,7 +27,7 @@
 #include "c-ctype.h"
 #include "gcd.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "minmax.h"
 #include "error.h"

diff --git a/gettext-tools/src/format-ycp.c b/gettext-tools/src/format-ycp.c
index cf9797deafee1ec8bcdf5c58d56b75ac1c92d97c..8acbf6b531c24f3cf67cef731112fbd78acad68c 100644 (file)
--- a/gettext-tools/src/format-ycp.c
+++ b/gettext-tools/src/format-ycp.c
@@ -26,7 +26,7 @@
 #include "format.h"
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "format-invalid.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index 1e044b91cb61cab80ecba0c1e6d8fc48a0d0d234..6074616933ec813972dd2f775d7372da76acf491 100644 (file)
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -34,7 +34,7 @@
 #include "closeout.h"
 #include "dir-list.h"
 #include "error.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "error-progname.h"
 #include "progname.h"
 #include "relocatable.h"

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 7871687b0d2e0b1d5e1ec6fc03413597250ba1b8..a181f71db81d4f78c811a6f3607af62d51d1e4f6 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -36,6 +36,7 @@
 #include "relocatable.h"
 #include "basename.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "xalloc.h"
 #include "stpcpy.h"
 #include "exit.h"

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index 73d49d5821c7de2df7ed49a6f77569afa1939799..97b15e34474ca0350f9197c181ea12a014d1a90b 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -89,6 +89,7 @@
 #include "exit.h"
 #include "pathname.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "msgl-english.h"
 #include "plural-count.h"
 #include "pipe.h"

diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c
index d46dff545e48df11bcf51e1d313e21ce6797c5a0..3ae79b88aeff2a8de6ed4989519f84cee8ddd74c 100644 (file)
--- a/gettext-tools/src/msgl-cat.c
+++ b/gettext-tools/src/msgl-cat.c
@@ -1,5 +1,5 @@
 /* Message list concatenation and duplicate handling.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@
 
 #include "error.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "message.h"
 #include "read-po.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/msgl-charset.c b/gettext-tools/src/msgl-charset.c
index db65795d294dd1b4ba0ac1b68f305bcd14a7b108..53592b6201deb0cc8e76749ba8f115871c51b589 100644 (file)
--- a/gettext-tools/src/msgl-charset.c
+++ b/gettext-tools/src/msgl-charset.c
@@ -1,5 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@
 #include "basename.h"
 #include "xallocsa.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "message.h"
 #include "strstr.h"
 #include "exit.h"

diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c
index 9d010f367a719f0855cd216ad00b0dc05b9b197c..8d3e484a9c8c9b49e5e8cb8d0fb7095ccd49b762 100644 (file)
--- a/gettext-tools/src/msgl-check.c
+++ b/gettext-tools/src/msgl-check.c
@@ -1,5 +1,5 @@
 /* Checking of messages in PO files.
-   Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 
 #include "c-ctype.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "format.h"
 #include "plural-exp.h"

diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c
index 163cdf1c5b02fff57cc5cf1fe60bfdc3f0ac1290..c171fa41ec379ab8dabab926a640169a9623bc16 100644 (file)
--- a/gettext-tools/src/msgl-iconv.c
+++ b/gettext-tools/src/msgl-iconv.c
@@ -42,7 +42,7 @@
 #include "xalloc.h"
 #include "xallocsa.h"
 #include "strstr.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/open-po.c b/gettext-tools/src/open-po.c
index 079954bc551bdc9f94135dcc06e46952c0df60e9..d92569fc18ebbc0fbc195a069d02c236aea43593 100644 (file)
--- a/gettext-tools/src/open-po.c
+++ b/gettext-tools/src/open-po.c
@@ -1,5 +1,5 @@
 /* open-po - search for .po file along search path list and open for reading
-   Copyright (C) 1995-1996, 2000-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2000-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 #include "dir-list.h"
 #include "pathname.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/po-charset.c b/gettext-tools/src/po-charset.c
index 23d29f0a43de224afc1fdaadfe79dbf8bfe25bc8..46d7bc5f2fc7c0d0db785bbd98d8fa5220e6d0a9 100644 (file)
--- a/gettext-tools/src/po-charset.c
+++ b/gettext-tools/src/po-charset.c
@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include "xallocsa.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "basename.h"
 #include "progname.h"

diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index a4c26937161ad1ded77947d9e120b2dd1ec32f53..c57786430a188f08b26fd60831aad774710f33fb 100644 (file)
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>.
    Multibyte character handling by Bruno Haible <haible@clisp.cons.org>.
@@ -46,7 +46,7 @@
 #include "exit.h"
 #include "error.h"
 #include "error-progname.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-error.h"
 #include "po-xerror.h"
 #include "pos.h"

diff --git a/gettext-tools/src/po-time.c b/gettext-tools/src/po-time.c
index 48622d4b79a2a11fbfae93c54f018c2882ef2dc1..6e374347c5134273571563130e550ec2a93d70cd 100644 (file)
--- a/gettext-tools/src/po-time.c
+++ b/gettext-tools/src/po-time.c
@@ -1,5 +1,5 @@
 /* PO/POT file timestamps.
-   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 /* Specification.  */
 #include "po-time.h"
 
-#include "xerror.h"
+#include "xvasprintf.h"
 
 
 #define TM_YEAR_ORIGIN 1900

diff --git a/gettext-tools/src/po-xerror.c b/gettext-tools/src/po-xerror.c
index 0e5de275fb74870f58697e658451475f0e284e31..869b1c796ef606ca587d12c48e9aa909e59cde09 100644 (file)
--- a/gettext-tools/src/po-xerror.c
+++ b/gettext-tools/src/po-xerror.c
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,7 @@
 #include "error-progname.h"
 #include "xalloc.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "po-error.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/read-po-abstract.c b/gettext-tools/src/read-po-abstract.c
index fa8fe37041973e3c9cb6740c9019c541ff76c66f..b3c2790ca600213fc623662f182152f452ca8dc1 100644 (file)
--- a/gettext-tools/src/read-po-abstract.c
+++ b/gettext-tools/src/read-po-abstract.c
@@ -1,5 +1,5 @@
 /* Reading PO files, abstract class.
-   Copyright (C) 1995-1996, 1998, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998, 2000-2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -32,7 +32,7 @@
 #include "read-properties.h"
 #include "read-stringtable.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c
index 9b853a8725220f1302d652a0844bed3952a2313e..c08839cb5fde96694562e66475e2575cb8a85b32 100644 (file)
--- a/gettext-tools/src/read-properties.c
+++ b/gettext-tools/src/read-properties.c
@@ -1,5 +1,5 @@
 /* Reading Java .properties files.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 #include "message.h"
 #include "read-po-abstract.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "msgl-ascii.h"
 #include "utf16-ucs4.h"

diff --git a/gettext-tools/src/read-stringtable.c b/gettext-tools/src/read-stringtable.c
index 59f78e4658f8e75d4aba8dfc2eba85cbb031d4a0..1565ed39732c092c3b23e8c5b2712353e0050527 100644 (file)
--- a/gettext-tools/src/read-stringtable.c
+++ b/gettext-tools/src/read-stringtable.c
@@ -1,5 +1,5 @@
 /* Reading NeXTstep/GNUstep .strings files.
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #include "error-progname.h"
 #include "read-po-abstract.h"
 #include "xalloc.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "utf8-ucs4.h"
 #include "ucs4-utf8.h"

diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index 89adbf844935a734c2edae35569d3d9bf88bfb0e..2ace2b25a5058f85ea8f52718b91ae0ae1013fb5 100644 (file)
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -46,7 +46,7 @@
 #include "strstr.h"
 #include "fwriteerror.h"
 #include "error-progname.h"
-#include "xerror.h"
+#include "xvasprintf.h"
 #include "po-xerror.h"
 #include "gettext.h"
 

diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
index 4d87cb9972dff7bf1ab8a9b2040589d02d71e6c6..d774d6dc754bf661754999bf5e99c12c19d10e7c 100644 (file)
--- a/gettext-tools/src/x-csharp.c
+++ b/gettext-tools/src/x-csharp.c
@@ -34,6 +34,7 @@
 #include "error-progname.h"
 #include "xalloc.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "exit.h"
 #include "hash.h"
 #include "po-charset.h"

diff --git a/gettext-tools/src/x-glade.c b/gettext-tools/src/x-glade.c
index b15c7056dcc5b6fe0da99fba567d06f3c4b8b432..bc76421044b332a93b51df21e9410dc46683a328 100644 (file)
--- a/gettext-tools/src/x-glade.c
+++ b/gettext-tools/src/x-glade.c
@@ -39,6 +39,7 @@
 #include "x-glade.h"
 #include "error.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "basename.h"
 #include "progname.h"
 #include "xalloc.h"

diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index 87b49db15c888b8798600c1f89e5714530ad3b3b..7a3d4b122a003d2d62b6eff0f0a0d41fe077dcb3 100644 (file)
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -36,6 +36,7 @@
 #include "progname.h"
 #include "basename.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "xalloc.h"
 #include "exit.h"
 #include "strstr.h"

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index ba026592868a4bb2ac9fa86e10dea0a4743032ad..f03166aeb3fb89fbaf61aa74550e142a3bfc8842 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -43,6 +43,7 @@
 #include "relocatable.h"
 #include "basename.h"
 #include "xerror.h"
+#include "xvasprintf.h"
 #include "xalloc.h"
 #include "xallocsa.h"
 #include "strstr.h"