[vlc-commits] Move vlc_gettext() with vlc_bindtextdomain()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  7 17:04:51 2011 +0300| [7b3f9bc354eb7d7cb00c5a16a6eeef5d5658baee] | committer: Rémi Denis-Courmont

Move vlc_gettext() with vlc_bindtextdomain()

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

 src/extras/libc.c        |   18 ------------------
 src/modules/textdomain.c |   14 ++++++++++++++
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/extras/libc.c b/src/extras/libc.c
index 1c1e77f..37d4e33 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -61,24 +61,6 @@
 
 
 
-#ifdef ENABLE_NLS
-# include <libintl.h>
-#endif
-
-/**
- * In-tree plugins share their gettext domain with LibVLC.
- */
-char *vlc_gettext( const char *msgid )
-{
-#ifdef ENABLE_NLS
-    if( unlikely(!*msgid))
-        return (char *)"";
-    return dgettext( PACKAGE_NAME, msgid );
-#else
-    return (char *)msgid;
-#endif
-}
-
 /*****************************************************************************
  * Local conversion routine from ISO_6937 to UTF-8 charset. Support for this
  * is still missing in libiconv, hence multiple operating systems lack it.
diff --git a/src/modules/textdomain.c b/src/modules/textdomain.c
index 4b5ac5b..60a1682 100644
--- a/src/modules/textdomain.c
+++ b/src/modules/textdomain.c
@@ -91,3 +91,17 @@ int vlc_bindtextdomain (const char *domain)
 
     return 0;
 }
+
+/**
+ * In-tree plugins share their gettext domain with LibVLC.
+ */
+char *vlc_gettext (const char *msgid)
+{
+#ifdef ENABLE_NLS
+    if (unlikely(!*msgid))
+        return (char *)"";
+    return dgettext (PACKAGE_NAME, msgid);
+#else
+    return (char *)msgid;
+#endif
+}