libgettextpo: Remove static variable error_with_progname, part 2.

* gettext-tools/src/read-po-lex.h: Don't include error-progname.h.
* gettext-tools/src/format-scheme.c: Likewise.
* gettext-tools/src/read-desktop.c: Likewise.
* gettext-tools/src/x-desktop.c: Likewise.

diff --git a/.gitignore b/.gitignore
index 8ab3d53a376b0aaab2d7a10bbd43f0eb77520a7f..1ebfca05cc12db3794ed145f80fdeb262e42488c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -95,8 +95,6 @@
 /gettext-tools/libgettextpo/dosname.h
 /gettext-tools/libgettextpo/dup2.c
 /gettext-tools/libgettextpo/errno.in.h
-/gettext-tools/libgettextpo/error-progname.c
-/gettext-tools/libgettextpo/error-progname.h
 /gettext-tools/libgettextpo/error.c
 /gettext-tools/libgettextpo/error.in.h
 /gettext-tools/libgettextpo/exitfail.c

diff --git a/gettext-tools/src/format-scheme.c b/gettext-tools/src/format-scheme.c
index 6e1a5210792711848d0d230bf8245f7ead24b804..0841587004134c1b0320aea9ef0f29d7684446ba 100644 (file)
--- a/gettext-tools/src/format-scheme.c
+++ b/gettext-tools/src/format-scheme.c
@@ -31,7 +31,6 @@
 #include "xvasprintf.h"
 #include "format-invalid.h"
 #include "minmax.h"
-#include "error-progname.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/read-desktop.c b/gettext-tools/src/read-desktop.c
index a12c4bf2ea7bfb4d4dd2f17d507781e836819572..490a51d97234e38fb4c6ff376b49979da501caa6 100644 (file)
--- a/gettext-tools/src/read-desktop.c
+++ b/gettext-tools/src/read-desktop.c
@@ -32,7 +32,6 @@
 #include <string.h>
 
 #include <error.h>
-#include "error-progname.h"
 #include "xalloc.h"
 #include "xvasprintf.h"
 #include "c-ctype.h"

diff --git a/gettext-tools/src/read-po-lex.h b/gettext-tools/src/read-po-lex.h
index ac4e6c092dc9b4ada559ebc32deed865b830563d..96f5692b4a53d5c2c82f62fae4cefb80b04c1970 100644 (file)
--- a/gettext-tools/src/read-po-lex.h
+++ b/gettext-tools/src/read-po-lex.h
@@ -24,7 +24,6 @@
 #include <stdbool.h>
 
 #include <error.h>
-#include "error-progname.h"
 #include "pos.h"
 #include "read-catalog-abstract.h"
 

diff --git a/gettext-tools/src/x-desktop.c b/gettext-tools/src/x-desktop.c
index 6519ab5fee58a03e57d66c03ed766a9a3cdd71c7..4f36dd027b9032e8bec02d50b3d138a7c27a83d0 100644 (file)
--- a/gettext-tools/src/x-desktop.c
+++ b/gettext-tools/src/x-desktop.c
@@ -33,7 +33,6 @@
 #include "message.h"
 #include "xgettext.h"
 #include "xg-message.h"
-#include "error-progname.h"
 #include "xalloc.h"
 #include "xvasprintf.h"
 #include "mem-hash-map.h"