make it possible to disable single-file includes by defining

[platform/upstream/glib.git] / glib / gi18n-lib.h

diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
index dc1a620..0d67017 100644 (file)
--- a/glib/gi18n-lib.h
+++ b/glib/gi18n-lib.h
@@ -16,12 +16,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #ifndef __G_I18N_LIB_H__
 #define __G_I18N_LIB_H__
 
-#include <glib/gstrfuncs.h>
-
-#ifdef ENABLE_NLS
+#include <glib.h>
 
 #include <libintl.h>
 
@@ -29,27 +28,9 @@
 #error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
 #endif
 
-#define _(String) dgettext (GETTEXT_PACKAGE, String)
-#define Q_(String) g_strip_context ((String), dgettext (GETTEXT_PACKAGE, String))
-#ifdef gettext_noop
-#define N_(String) gettext_noop (String)
-#else
-#define N_(String) (String)
-#endif
-
-#else /* NLS is disabled */
-
-#define _(String) (String)
-#define Q_(String) (String)
+#define  _(String) dgettext (GETTEXT_PACKAGE, String)
+#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, 0)
 #define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain) 
-
-#endif
+#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1)
 
 #endif  /* __G_I18N_LIB_H__ */
-
-