From: Bruno Haible Date: Tue, 2 May 2006 12:35:09 +0000 (+0000) Subject: Move the xasprintf function from the 'xerror' module to the 'xvasprintf' X-Git-Tag: v0.15~204 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e950fec4d8217cc1679d5f5063c7d3bed1ebaf5;p=thirdparty%2Fgettext.git 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 8c794dccc..0f317d30c 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,20 @@ +2006-04-30 Bruno Haible + + * 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 * 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 17077b65b..128c7d2ef 100644 --- 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 20ad04b1c..181a119bf 100644 --- 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 88cf294d2..c0b403bb7 100644 --- 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 22370e40c..c8b327211 100644 --- 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 , 2001. This program is free software; you can redistribute it and/or modify @@ -27,31 +27,10 @@ #include #include #include -#include -#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 e6be4da7a..4e539d892 100644 --- 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 , 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 ba4d412ea..8db1b543e 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,37 @@ +2006-04-30 Bruno Haible + + * 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 * 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 ccf4f6101..70f9d5eef 100644 --- 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 e31bebff3..31d27bc81 100644 --- 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 966ede263..2fd759354 100644 --- 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 43713aed8..c3842f1b3 100644 --- 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 b7f6de193..936297d10 100644 --- 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 4b746b2ec..c43143943 100644 --- 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 20d6632a1..753981086 100644 --- 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 b86de591b..35012e35a 100644 --- 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 f4da230d0..aa51a93c5 100644 --- 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 7497a9284..5005b02bc 100644 --- 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 cf9797dea..8acbf6b53 100644 --- 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 1e044b91c..607461693 100644 --- 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 7871687b0..a181f71db 100644 --- 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 73d49d582..97b15e344 100644 --- 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 d46dff545..3ae79b88a 100644 --- 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 , 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 db65795d2..53592b620 100644 --- 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 , 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 9d010f367..8d3e484a9 100644 --- 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 , 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 163cdf1c5..c171fa41e 100644 --- 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 079954bc5..d92569fc1 100644 --- 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 , 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 23d29f0a4..46d7bc5f2 100644 --- a/gettext-tools/src/po-charset.c +++ b/gettext-tools/src/po-charset.c @@ -29,7 +29,7 @@ #include #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 a4c269371..c57786430 100644 --- 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 . Multibyte character handling by Bruno Haible . @@ -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 48622d4b7..6e374347c 100644 --- 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 , 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 0e5de275f..869b1c796 100644 --- 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 , 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 fa8fe3704..b3c2790ca 100644 --- 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 @@ -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 9b853a872..c08839cb5 100644 --- 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 , 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 59f78e465..1565ed397 100644 --- 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 , 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 89adbf844..2ace2b25a 100644 --- 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 @@ -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 4d87cb997..d774d6dc7 100644 --- 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 b15c7056d..bc7642104 100644 --- 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 87b49db15..7a3d4b122 100644 --- 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 ba0265928..f03166aeb 100644 --- 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"