summaryrefslogtreecommitdiffhomepage
path: root/mixlib
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2002-12-08 00:35:54 +0000
committerJose Antonio Ortega Ruiz <jao@gnu.org>2002-12-08 00:35:54 +0000
commit38eabc5fb5895454d8249d73b2d16b9a71898caf (patch)
treedf10a000663c7440467d60baa0936406324165c9 /mixlib
parentcae36c7c0b9ee0b07d421c56eab9f2e8f6fdd188 (diff)
downloadmdk-38eabc5fb5895454d8249d73b2d16b9a71898caf.tar.gz
mdk-38eabc5fb5895454d8249d73b2d16b9a71898caf.tar.bz2
corrections to gettext infrastructure
Diffstat (limited to 'mixlib')
-rw-r--r--mixlib/gettext.h69
-rw-r--r--mixlib/mix.h5
2 files changed, 73 insertions, 1 deletions
diff --git a/mixlib/gettext.h b/mixlib/gettext.h
new file mode 100644
index 0000000..8b262f4
--- /dev/null
+++ b/mixlib/gettext.h
@@ -0,0 +1,69 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+ 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 2, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ 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 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))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((const char *) (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/mixlib/mix.h b/mixlib/mix.h
index c33cc98..b9b3e4d 100644
--- a/mixlib/mix.h
+++ b/mixlib/mix.h
@@ -1,7 +1,7 @@
/* -*-c-*- ---------------- mix.h :
* Initialisation of the mix library
* ------------------------------------------------------------------
- * $Id: mix.h,v 1.5 2001/09/29 01:54:30 jao Exp $
+ * $Id: mix.h,v 1.6 2002/12/08 00:35:54 jao Exp $
* ------------------------------------------------------------------
* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
*
@@ -37,12 +37,15 @@
# include <locale.h>
#endif
+/*
#ifdef HAVE_GETTEXT
# include <libintl.h>
# define gettext_noop(String) (String)
#else
# include <intl/libgettext.h>
#endif
+*/
+#include "gettext.h"
#define _(String) gettext (String)
#define N_(String) gettext_noop (String)