From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri, 17 Oct 2025 19:12:52 +0000 (-0300)
Subject: catgets: Remove catgets/config.h
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=717d44840aea5cc8cfa0602b488f85ec55c52002;p=thirdparty%2Fglibc.git

catgets: Remove catgets/config.h

It simplifies the code a bit and avoid the clang warning:

  ./config.h:12:2: error: #include_next in file found relative to primary
  source file or found by absolute path; will search from start of include
  path [-Werror,-Winclude-next-absolute-path]
  #include_next <config.h>
   ^

Reviewed-by: Sam James <sam@gentoo.org>
---

diff --git a/catgets/config.h b/catgets/config.h
deleted file mode 100644
index ce7887b351..0000000000
--- a/catgets/config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _CG_CONFIG_H
-#define _CG_CONFIG_H
-
-/* Use the internal textdomain used for libc messages.  */
-#define PACKAGE _libc_intl_domainname
-#ifndef VERSION
-/* Get libc version number.  */
-#include "../version.h"
-#endif
-
-
-#include_next <config.h>
-
-#endif
diff --git a/catgets/gencat.c b/catgets/gencat.c
index 6a53a72eec..835dd06e33 100644
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -14,8 +14,9 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <https://www.gnu.org/licenses/>.  */
 
+#define PACKAGE _libc_intl_domainname
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <argp.h>