commit 484f797cb24122e0acb7be57cf89da2de0c285eb
parent ab4f681db83eb32c6ecf19cf705d2879274a93be
Author: Christian Grothoff <christian@grothoff.org>
Date: Fri, 6 Mar 2026 21:31:05 +0100
remove gettext.h duplication by merchant, we have it already in the exchange
Diffstat:
3 files changed, 1 insertion(+), 77 deletions(-)
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
@@ -1,7 +1,2 @@
# This Makefile.am is in the public domain
SUBDIRS = taler .
-
-talerincludedir = $(includedir)/taler
-
-talerinclude_HEADERS = \
- gettext.h
diff --git a/src/include/gettext.h b/src/include/gettext.h
@@ -1,71 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
- Copyright Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA. */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option. */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions. */
-#include <libintl.h>
-
-#else
-
-/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
- chokes if dcgettext is defined as a macro. So include it now, to make
- later inclusions of <locale.h> a NOP. We don't include <libintl.h>
- as well because people using "gettext.h" will not include <libintl.h>,
- and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
- is GNUNET_OK. */
-#if defined(__sun)
-#include <locale.h>
-#endif
-
-/* Disabled NLS.
- The casts to 'const char *' serve the purpose of producing warnings
- for invalid uses of the value returned from these functions.
- On pre-ANSI systems without 'const', the config.h file is supposed to
- contain "#define const". */
-#define gettext(Msgid) ((const char *) (Msgid))
-#define dgettext(Domainname, Msgid) ((const char *) (Msgid))
-#define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
-#define ngettext(Msgid1, Msgid2, N) \
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-#define dngettext(Domainname, Msgid1, Msgid2, N) \
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-#define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-/* slight modification here to avoid warnings: generate GNUNET_NO code,
- not even the cast... */
-#define textdomain(Domainname)
-#define bindtextdomain(Domainname, Dirname)
-#define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
-
-#endif
-
-/* A pseudo function call that serves as a marker for the automated
- extraction of messages, but does not call gettext(). The run-time
- translation is done at a different place in the code.
- The argument, String, should be a literal string. Concatenated strings
- and other string expressions won't work.
- The macro's expansion is not parenthesized, so that it is suitable as
- initializer for static 'char[]' or 'const char[]' variables. */
-#define gettext_noop(String) String
-
-#endif /* _LIBGETTEXT_H */
diff --git a/src/include/taler/platform.h b/src/include/taler/platform.h
@@ -170,7 +170,7 @@
#define NEWLINE "\n"
#include <locale.h>
-#include "gettext.h"
+#include <taler/gettext.h>
/**
* GNU gettext support macro.
*/
