From: Bruno Haible <bruno@clisp.org>
Date: Sun, 28 Jul 2024 18:34:25 +0000 (+0200)
Subject: Refactor read-catalog-special.[hc], part 2.
X-Git-Tag: v0.23~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=966a7b823176ef9eda7713e98ece2db3786a4b16;p=thirdparty%2Fgettext.git

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 d9db2d847..e6fd03416 100644
--- 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 5f69a2e43..451962e9b 100644
--- 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 53a92b00d..2cd7af166 100644
--- 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"