Blind attempt at fixing the libintl/g++-4.2 problem

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index b5a46a9d55c01c2df0daa8da835e5d18f766e514..df250fc81876a12b51f7a4e163606d48b00277ba 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -230,8 +230,6 @@ typedef void *locale_t;
 
 #if defined (ENABLE_NLS)
 # include <libintl.h>
-#else
-# define dgettext(dom, str) ((char *)(str))
 #endif
 
 #define N_(str) gettext_noop (str)

diff --git a/src/extras/libc.c b/src/extras/libc.c
index 8e210e0f24c244dcdfb8a10a09841447a94af519..19cbdf2afdd6ff779cd3d85504aab15cc59578cd 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -327,7 +327,11 @@ int vlc_wclosedir( void *_p_dir )
  */
 char *vlc_gettext( const char *msgid )
 {
+#ifdef ENABLE_NLS
     return dgettext( PACKAGE_NAME, msgid );
+#else
+    return (char *)msgid;
+#endif
 }
 
 /*****************************************************************************

diff --git a/src/modules/entry.c b/src/modules/entry.c
index 3abc6cb8c725190b294b06a8107e30a5d7dc3fb6..db7b731353c41a487c91af56207e6fb687e1e3af 100644 (file)
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -31,6 +31,9 @@
 #include "modules/modules.h"
 #include "config/configuration.h"
 #include "libvlc.h"
+#ifndef ENABLE_NLS
+# define dgettext(d, m) ((char *)(m))
+#endif
 
 static const char default_name[] = "unnamed";