Changeset 0b06fc57642beaf6e21c5cfdcb9166a52f3dc1f8

Timestamp:

06/11/08 17:57:54 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213199874 +0300

git-parent:

[e39bc8a53f6217f817a1e8dabbcd1c7e292bc545]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213199874 +0300

Message:

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

Files:

• include/vlc_fixups.h (modified) (1 diff)
• src/extras/libc.c (modified) (1 diff)
• src/modules/entry.c (modified) (1 diff)

include/vlc_fixups.h

@@ -231 +231 @@
-#if defined (ENABLE_NLS)
-# include <libintl.h>
-#else
-# define dgettext(dom, str) ((char *)(str))
-#endif
-

src/extras/libc.c

@@ -328 +328 @@
-char *vlc_gettext( const char *msgid )
-{
+#ifdef ENABLE_NLS
-    return dgettext( PACKAGE_NAME, msgid );
+#else
+    return (char *)msgid;
+#endif
-}
-

src/modules/entry.c

@@ -32 +32 @@
-#include "config/configuration.h"
-#include "libvlc.h"
+#ifndef ENABLE_NLS
+# define dgettext(d, m) ((char *)(m))
+#endif
-
-static const char default_name[] = "unnamed";