Refactor read-catalog-special.[hc], part 2.

* gettext-tools/src/read-catalog.c: Include read-catalog-special.h.
* gettext-tools/src/xg-message.c: Include read-catalog-special.h instead of
read-catalog-abstract.h.
* gettext-tools/src/x-ruby.c: Likewise.

diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
index d9db2d8478a8340a71690e2ceeb707cfbd327b2d..e6fd03416503801a572ae3bb827b213a4b071442 100644 (file)
--- a/gettext-tools/src/read-catalog.c
+++ b/gettext-tools/src/read-catalog.c
@@ -29,6 +29,7 @@
 #include "po-charset.h"
 #include "po-xerror.h"
 #include "xalloc.h"
+#include "read-catalog-special.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)

diff --git a/gettext-tools/src/x-ruby.c b/gettext-tools/src/x-ruby.c
index 5f69a2e43c32e14c03b43cd6eab25c36e411620f..451962e9b42a5c8739fb77beb8627883fb2e73f8 100644 (file)
--- a/gettext-tools/src/x-ruby.c
+++ b/gettext-tools/src/x-ruby.c
@@ -38,7 +38,7 @@
 #include "xgettext.h"
 #include "xg-message.h"
 #include "c-strstr.h"
-#include "read-catalog-abstract.h"
+#include "read-catalog-special.h"
 #include "gettext.h"
 
 /* A convenience macro.  I don't like writing gettext() every time.  */

diff --git a/gettext-tools/src/xg-message.c b/gettext-tools/src/xg-message.c
index 53a92b00dd7deb2c3fa4ecf7e14757186b9f3cf3..2cd7af1669b037303c77b4893f9e737998596c5d 100644 (file)
--- a/gettext-tools/src/xg-message.c
+++ b/gettext-tools/src/xg-message.c
@@ -1,5 +1,5 @@
 /* Extracting a message.  Accumulating the message list.
-   Copyright (C) 2001-2020, 2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 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
@@ -26,7 +26,7 @@
 #include "c-strstr.h"
 #include "if-error.h"
 #include "format.h"
-#include "read-catalog-abstract.h"
+#include "read-catalog-special.h"
 #include "xalloc.h"
 #include "xerror.h"
 #include "xvasprintf.h"