# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1188771185 0
# Node ID 6f9c5bb127e6ad4a9990307f52a35267ed58c9b0
# Parent  ddae043e8e47d76337a3f1d9990574a4a4eea585
Moved NLS macros to xs_support.h


diff -r ddae043e8e47 -r 6f9c5bb127e6 src/xmms-sid.h
--- a/src/xmms-sid.h	Sun Sep 02 22:00:00 2007 +0000
+++ b/src/xmms-sid.h	Sun Sep 02 22:13:05 2007 +0000
@@ -31,30 +31,6 @@
 #endif
 
 /*
- * Standard gettext macros.
- */
-#ifdef ENABLE_NLS
-#  include <libintl.h>
-#  undef _
-#  define _(String) dgettext (PACKAGE, String)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#else
-#  define _LIBINTL_H
-#  define textdomain(String) (String)
-#  define gettext(String) (String)
-#  define dgettext(Domain,Message) (Message)
-#  define dcgettext(Domain,Message,Type) (Message)
-#  define bindtextdomain(Domain,Directory) (Domain)
-#  define _(String) (String)
-#  define N_(String) (String)
-#endif
-
-
-/*
  * Some constants and defines
  */
 /* #define to enable spurious debugging messages for development
diff -r ddae043e8e47 -r 6f9c5bb127e6 src/xs_support.h
--- a/src/xs_support.h	Sun Sep 02 22:00:00 2007 +0000
+++ b/src/xs_support.h	Sun Sep 02 22:13:05 2007 +0000
@@ -43,13 +43,29 @@
 #endif
 
 
-/* Metadata structures */
-#ifdef AUDACIOUS_PLUGIN
-#define t_xs_tuple Tuple
+/* Standard gettext macros
+ */
+#ifdef ENABLE_NLS
+#  include <libintl.h>
+#  undef _
+#  define _(String) dgettext (PACKAGE, String)
+#  ifdef gettext_noop
+#    define N_(String) gettext_noop (String)
+#  else
+#    define N_(String) (String)
+#  endif
 #else
-#define t_xs_tuple TitleInput
+#  define _LIBINTL_H
+#  define textdomain(String) (String)
+#  define gettext(String) (String)
+#  define dgettext(Domain,Message) (Message)
+#  define dcgettext(Domain,Message,Type) (Message)
+#  define bindtextdomain(Domain,Directory) (Domain)
+#  define _(String) (String)
+#  define N_(String) (String)
 #endif
 
+
 /* VFS replacement functions
  */
 #ifdef __AUDACIOUS_NEWVFS__