summaryrefslogtreecommitdiff
path: root/libebl
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2020-12-16 08:00:00 +0000
committerDmitry V. Levin <ldv@altlinux.org>2020-12-16 10:01:52 +0000
commit0a5defb64e94ecb2847b98b2c29155131edeaf97 (patch)
tree2fbbe796e985ad1cefdf4234de8654ce56c14d5e /libebl
parent2e0ae048de8ada585e8ba7d505aad5c3268f8433 (diff)
downloadelfutils-0a5defb64e94ecb2847b98b2c29155131edeaf97.tar.gz
Consistently define _(Str) using dgettext ("elfutils", Str)
Move the definition of _(Str) macro to lib/eu-config.h which already provides a definition of N_(Str) macro. Since lib/eu-config.h is appended to config.h, it is included into every compilation unit and therefore both macros are now universally available. Remove all other definitions of N_(Str) and _(Str) macros from other files to avoid conflicts and redundancies. The next step is to replace all uses of gettext(Str) with _(Str). Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Diffstat (limited to 'libebl')
-rw-r--r--libebl/ChangeLog4
-rw-r--r--libebl/libeblP.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/libebl/ChangeLog b/libebl/ChangeLog
index e0862ec3..33208f0d 100644
--- a/libebl/ChangeLog
+++ b/libebl/ChangeLog
@@ -1,3 +1,7 @@
+2020-12-16 Dmitry V. Levin <ldv@altlinux.org>
+
+ * libeblP.h (_): Remove.
+
2020-12-15 Dmitry V. Levin <ldv@altlinux.org>
* eblbackendname.c (ebl_backend_name): Replace gettext(...) with _(...).
diff --git a/libebl/libeblP.h b/libebl/libeblP.h
index 599f6378..fa1c2c9f 100644
--- a/libebl/libeblP.h
+++ b/libebl/libeblP.h
@@ -86,11 +86,6 @@ struct ebl
typedef Ebl *(*ebl_bhinit_t) (Elf *, GElf_Half, Ebl *);
-/* gettext helper macros. */
-#undef _
-#define _(Str) dgettext ("elfutils", Str)
-
-
/* LEB128 constant helper macros. */
#define ULEB128_7(x) (BUILD_BUG_ON_ZERO ((x) >= (1U << 7)) + (x))