From: Yonggang Luo <luoyonggang@gmail.com>
To: elfutils-devel@sourceware.org
Cc: Yonggang Luo <luoyonggang@gmail.com>
Subject: [PATCH v2 3/7] Move the #include <libintl.h> into eu-config.h
Date: Sun, 16 Oct 2022 00:36:21 +0800 [thread overview]
Message-ID: <20221015163622.129-3-luoyonggang@gmail.com> (raw)
In-Reply-To: <20221015163622.129-1-luoyonggang@gmail.com>
So we do not need include in each file.
And indeed the macro
#define _(Str) dgettext ("elfutils", Str)
access libintl function dgettext, so it's make more sense
#include <libintl.h> in file eu-config.h
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
debuginfod/debuginfod.cxx | 1 -
lib/color.c | 1 -
lib/eu-config.h | 1 +
lib/printversion.c | 1 -
lib/xasprintf.c | 1 -
lib/xmalloc.c | 1 -
libasm/asm_end.c | 1 -
libasm/asm_error.c | 1 -
libasm/asm_newscn.c | 1 -
libcpu/i386_lex.l | 1 -
libcpu/i386_parse.y | 1 -
libdw/libdwP.h | 1 -
libdwfl/argp-std.c | 1 -
libdwfl/dwfl_error.c | 1 -
libebl/libeblP.h | 1 -
libelf/elf_error.c | 1 -
src/addr2line.c | 1 -
src/ar.c | 1 -
src/arlib-argp.c | 1 -
src/arlib.c | 1 -
src/arlib2.c | 1 -
src/elfcmp.c | 1 -
src/elflint.c | 1 -
src/findtextrel.c | 1 -
src/nm.c | 1 -
src/objdump.c | 1 -
src/ranlib.c | 1 -
src/readelf.c | 1 -
src/size.c | 1 -
src/strings.c | 1 -
src/strip.c | 1 -
src/unstrip.c | 1 -
32 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 000a41c4..8e7ee499 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -47,7 +47,6 @@ extern "C" {
#include <unistd.h>
#include <stdlib.h>
-#include <libintl.h>
#include <locale.h>
#include <pthread.h>
#include <signal.h>
diff --git a/lib/color.c b/lib/color.c
index e43b6143..bd105ec2 100644
--- a/lib/color.c
+++ b/lib/color.c
@@ -32,7 +32,6 @@
#endif
#include <argp.h>
-#include <libintl.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/lib/eu-config.h b/lib/eu-config.h
index c7d7cbb2..78a5c4fe 100644
--- a/lib/eu-config.h
+++ b/lib/eu-config.h
@@ -52,6 +52,7 @@
# define rwlock_unlock(lock) ((void) (lock))
#endif /* USE_LOCKS */
+#include <libintl.h>
/* gettext helper macros. */
#define N_(Str) Str
#define _(Str) dgettext ("elfutils", Str)
diff --git a/lib/printversion.c b/lib/printversion.c
index f657329c..7d31fa83 100644
--- a/lib/printversion.c
+++ b/lib/printversion.c
@@ -30,7 +30,6 @@
# include <config.h>
#endif
-#include <libintl.h>
#include "printversion.h"
void
diff --git a/lib/xasprintf.c b/lib/xasprintf.c
index 179ea2e8..d61fad90 100644
--- a/lib/xasprintf.c
+++ b/lib/xasprintf.c
@@ -33,7 +33,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libintl.h>
#include "libeu.h"
#include "system.h"
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 7c094985..de7211f1 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -30,7 +30,6 @@
# include <config.h>
#endif
-#include <libintl.h>
#include <stddef.h>
#include <stdlib.h>
#include <sys/types.h>
diff --git a/libasm/asm_end.c b/libasm/asm_end.c
index 077d2aa5..a26120f2 100644
--- a/libasm/asm_end.c
+++ b/libasm/asm_end.c
@@ -32,7 +32,6 @@
#endif
#include <assert.h>
-#include <libintl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/libasm/asm_error.c b/libasm/asm_error.c
index cc3e660b..2b769395 100644
--- a/libasm/asm_error.c
+++ b/libasm/asm_error.c
@@ -31,7 +31,6 @@
# include <config.h>
#endif
-#include <libintl.h>
#include <stdbool.h>
#include <stdlib.h>
diff --git a/libasm/asm_newscn.c b/libasm/asm_newscn.c
index 1150015f..d258d969 100644
--- a/libasm/asm_newscn.c
+++ b/libasm/asm_newscn.c
@@ -32,7 +32,6 @@
#endif
#include <assert.h>
-#include <libintl.h>
#include <stdlib.h>
#include <string.h>
diff --git a/libcpu/i386_lex.l b/libcpu/i386_lex.l
index b6ec0f87..9b33ed95 100644
--- a/libcpu/i386_lex.l
+++ b/libcpu/i386_lex.l
@@ -31,7 +31,6 @@
#endif
#include <ctype.h>
-#include <libintl.h>
#include <libeu.h>
#include "system.h"
diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y
index 9a92c2e0..d2236d59 100644
--- a/libcpu/i386_parse.y
+++ b/libcpu/i386_parse.y
@@ -35,7 +35,6 @@
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
-#include <libintl.h>
#include <math.h>
#include <obstack.h>
#include <search.h>
diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index 56b388c1..961fa4e7 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -29,7 +29,6 @@
#ifndef _LIBDWP_H
#define _LIBDWP_H 1
-#include <libintl.h>
#include <stdbool.h>
#include <pthread.h>
diff --git a/libdwfl/argp-std.c b/libdwfl/argp-std.c
index 01ec18e2..bc013aa0 100644
--- a/libdwfl/argp-std.c
+++ b/libdwfl/argp-std.c
@@ -34,7 +34,6 @@
#include <argp.h>
#include <stdlib.h>
#include <assert.h>
-#include <libintl.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
index a5c683a9..43fa1dcc 100644
--- a/libdwfl/dwfl_error.c
+++ b/libdwfl/dwfl_error.c
@@ -31,7 +31,6 @@
#endif
#include <assert.h>
-#include <libintl.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/libebl/libeblP.h b/libebl/libeblP.h
index fa1c2c9f..c408ed97 100644
--- a/libebl/libeblP.h
+++ b/libebl/libeblP.h
@@ -32,7 +32,6 @@
#include <gelf.h>
#include <libasm.h>
#include <libebl.h>
-#include <libintl.h>
/* Backend handle. */
diff --git a/libelf/elf_error.c b/libelf/elf_error.c
index 5364e685..e596108d 100644
--- a/libelf/elf_error.c
+++ b/libelf/elf_error.c
@@ -32,7 +32,6 @@
#endif
#include <assert.h>
-#include <libintl.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/addr2line.c b/src/addr2line.c
index 25db2926..7768b266 100644
--- a/src/addr2line.c
+++ b/src/addr2line.c
@@ -28,7 +28,6 @@
#include <inttypes.h>
#include <libdwfl.h>
#include <dwarf.h>
-#include <libintl.h>
#include <locale.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/src/ar.c b/src/ar.c
index 04456c18..3bcb18fe 100644
--- a/src/ar.c
+++ b/src/ar.c
@@ -24,7 +24,6 @@
#include <assert.h>
#include <fcntl.h>
#include <gelf.h>
-#include <libintl.h>
#include <limits.h>
#include <locale.h>
#include <search.h>
diff --git a/src/arlib-argp.c b/src/arlib-argp.c
index a3c12e4d..115b9d76 100644
--- a/src/arlib-argp.c
+++ b/src/arlib-argp.c
@@ -20,7 +20,6 @@
#endif
#include <argp.h>
-#include <libintl.h>
#include "arlib.h"
diff --git a/src/arlib.c b/src/arlib.c
index c09fc3c6..b8f89ba7 100644
--- a/src/arlib.c
+++ b/src/arlib.c
@@ -23,7 +23,6 @@
#include <assert.h>
#include <gelf.h>
#include <inttypes.h>
-#include <libintl.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
diff --git a/src/arlib2.c b/src/arlib2.c
index 11f44e5d..9ae6662c 100644
--- a/src/arlib2.c
+++ b/src/arlib2.c
@@ -20,7 +20,6 @@
# include <config.h>
#endif
-#include <libintl.h>
#include <limits.h>
#include <string.h>
diff --git a/src/elfcmp.c b/src/elfcmp.c
index 21d8d9dc..fba67e02 100644
--- a/src/elfcmp.c
+++ b/src/elfcmp.c
@@ -25,7 +25,6 @@
#include <errno.h>
#include <fcntl.h>
#include <locale.h>
-#include <libintl.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/elflint.c b/src/elflint.c
index b0e5415e..565cffdc 100644
--- a/src/elflint.c
+++ b/src/elflint.c
@@ -27,7 +27,6 @@
#include <fcntl.h>
#include <gelf.h>
#include <inttypes.h>
-#include <libintl.h>
#include <locale.h>
#include <stdbool.h>
#include <stdlib.h>
diff --git a/src/findtextrel.c b/src/findtextrel.c
index ecb1d118..d3021a3a 100644
--- a/src/findtextrel.c
+++ b/src/findtextrel.c
@@ -26,7 +26,6 @@
#include <fcntl.h>
#include <gelf.h>
#include <libdw.h>
-#include <libintl.h>
#include <locale.h>
#include <search.h>
#include <stdbool.h>
diff --git a/src/nm.c b/src/nm.c
index 16647589..b46c1fd7 100644
--- a/src/nm.c
+++ b/src/nm.c
@@ -30,7 +30,6 @@
#include <gelf.h>
#include <inttypes.h>
#include <libdw.h>
-#include <libintl.h>
#include <locale.h>
#include <obstack.h>
#include <search.h>
diff --git a/src/objdump.c b/src/objdump.c
index b32de17d..d43c1dd6 100644
--- a/src/objdump.c
+++ b/src/objdump.c
@@ -23,7 +23,6 @@
#include <argp.h>
#include <fcntl.h>
#include <inttypes.h>
-#include <libintl.h>
#include <locale.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/src/ranlib.c b/src/ranlib.c
index bd7e1d8a..7838d69e 100644
--- a/src/ranlib.c
+++ b/src/ranlib.c
@@ -26,7 +26,6 @@
#include <errno.h>
#include <fcntl.h>
#include <gelf.h>
-#include <libintl.h>
#include <locale.h>
#include <obstack.h>
#include <stdlib.h>
diff --git a/src/readelf.c b/src/readelf.c
index 1a10fd01..a206e60e 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -30,7 +30,6 @@
#include <langinfo.h>
#include <libdw.h>
#include <libdwfl.h>
-#include <libintl.h>
#include <locale.h>
#include <stdarg.h>
#include <stdbool.h>
diff --git a/src/size.c b/src/size.c
index 8f203167..ff8ca075 100644
--- a/src/size.c
+++ b/src/size.c
@@ -25,7 +25,6 @@
#include <gelf.h>
#include <inttypes.h>
#include <libelf.h>
-#include <libintl.h>
#include <locale.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/src/strings.c b/src/strings.c
index 04aac3b6..55b047be 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -28,7 +28,6 @@
#include <fcntl.h>
#include <gelf.h>
#include <inttypes.h>
-#include <libintl.h>
#include <locale.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/src/strip.c b/src/strip.c
index 452b1279..2a2cc801 100644
--- a/src/strip.c
+++ b/src/strip.c
@@ -28,7 +28,6 @@
#include <fnmatch.h>
#include <gelf.h>
#include <libelf.h>
-#include <libintl.h>
#include <locale.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/src/unstrip.c b/src/unstrip.c
index 3472637a..d5bd1821 100644
--- a/src/unstrip.c
+++ b/src/unstrip.c
@@ -33,7 +33,6 @@
#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
-#include <libintl.h>
#include <locale.h>
#include <stdbool.h>
#include <stdio.h>
--
2.36.1.windows.1
next prev parent reply other threads:[~2022-10-15 16:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-15 16:36 [PATCH v2 0/7] Enable building libelf of elfutils on win32 Yonggang Luo
2022-10-15 16:36 ` [PATCH v2 2/7] move platform depended include into system.h of libelf Yonggang Luo
2022-10-16 20:47 ` Mark Wielaard
2022-10-15 16:36 ` Yonggang Luo [this message]
2022-10-16 20:49 ` [PATCH v2 3/7] Move the #include <libintl.h> into eu-config.h Mark Wielaard
2022-10-15 16:36 ` [PATCH v2 4/7] lib: Use NOT_HAVE_LIBINTL to guard #include <libintl.h> Yonggang Luo
2022-10-16 20:55 ` Mark Wielaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221015163622.129-3-luoyonggang@gmail.com \
--to=luoyonggang@gmail.com \
--cc=elfutils-devel@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).