Commit 4801c504 authored by panelpc's avatar panelpc

Backport gettext->vlc_gettext to fix --enable-live555 compile.

parent c330ec82
...@@ -175,10 +175,7 @@ typedef void *locale_t; ...@@ -175,10 +175,7 @@ typedef void *locale_t;
#endif #endif
/* libintl support */ /* libintl support */
#define _(str) gettext(str) #define _(str) vlc_gettext (str)
#define gettext(str) vlc_gettext (str)
#define pgettext(ctx,id) vlc_pgettext(ctx,id)
#define N_(str) gettext_noop (str) #define N_(str) gettext_noop (str)
#define gettext_noop(str) (str) #define gettext_noop(str) (str)
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
When compiling libc, the _ macro is predefined. */ When compiling libc, the _ macro is predefined. */
#ifdef HAVE_LIBINTL_H #ifdef HAVE_LIBINTL_H
#include <libintl.h> #include <libintl.h>
#define _(msgid) gettext (msgid) #define _(msgid) vlc_gettext (msgid)
#else #else
#define _(msgid) (msgid) #define _(msgid) (msgid)
#endif #endif
......
...@@ -192,7 +192,6 @@ int vlc_wclosedir( void *_p_dir ) ...@@ -192,7 +192,6 @@ int vlc_wclosedir( void *_p_dir )
} }
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
# undef gettext
# include <libintl.h> # include <libintl.h>
#endif #endif
......
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
#endif #endif
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
# undef gettext
# include <libintl.h> /* bindtextdomain */ # include <libintl.h> /* bindtextdomain */
#endif #endif
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <stdarg.h> #include <stdarg.h>
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
# undef gettext
# include <libintl.h> # include <libintl.h>
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment