[vlc-devel] commit: Blind attempt at fixing the libintl/g++-4.2 problem ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Jun 11 18:57:54 2008 +0300| [0b06fc57642beaf6e21c5cfdcb9166a52f3dc1f8]

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0b06fc57642beaf6e21c5cfdcb9166a52f3dc1f8
---

 include/vlc_fixups.h |    2 --
 src/extras/libc.c    |    4 ++++
 src/modules/entry.c  |    3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index b5a46a9..df250fc 100644
--- 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 8e210e0..19cbdf2 100644
--- 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 3abc6cb..db7b731 100644
--- 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";