From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 8D23D385DC1D; Tue, 2 Apr 2024 15:52:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D23D385DC1D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712073140; bh=peS5il6W+HgZAXdI2/lb0li5/ya8pNy6rC/AjSbuH44=; h=From:To:Subject:Date:From; b=JVhQJoSGy/D5VM9ZEugIS+VvrEe5+ffPHrxuAtUb3VThB0sJHGkj4dXtAwUYpbZxn ZVEtOk19xsPruYiMpBLBZG8N5AeavVZWliv9PrWGu2d5SI7LNBp1m4CW3evi5Ovs5V nJYt5qNtxjbEuvD18cBPq+vk7Ase6wLhlb9UDJ/k= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] catgets: Remove catgets/config.h X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: c87459228b4f4b6e48e37ab35dd698abfba28ca0 X-Git-Newrev: 4394e759d18b93c22038c0bb686162d4bd2ff4af Message-Id: <20240402155220.8D23D385DC1D@sourceware.org> Date: Tue, 2 Apr 2024 15:52:20 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4394e759d18b93c22038c0bb686162d4bd2ff4af commit 4394e759d18b93c22038c0bb686162d4bd2ff4af Author: Adhemerval Zanella Date: Thu Mar 10 10:52:14 2022 -0300 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 ^ Diff: --- catgets/config.h | 14 -------------- catgets/gencat.c | 3 ++- 2 files changed, 2 insertions(+), 15 deletions(-) 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 - -#endif diff --git a/catgets/gencat.c b/catgets/gencat.c index 7110970bd5..52bdade900 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 . */ +#define PACKAGE _libc_intl_domainname #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif #include