Merge branch 'master' into lpcm_encoder

[vlc] / src / modules / textdomain.c

diff --git a/src/modules/textdomain.c b/src/modules/textdomain.c
index 847ba2e061009b4efbb203248e6c6750151cbd8e..4d7e54e75fe51c217b6c47a6ef1a3b20b55f65c8 100644 (file)
--- a/src/modules/textdomain.c
+++ b/src/modules/textdomain.c
@@ -27,6 +27,9 @@
 
 #ifdef ENABLE_NLS
 # include <libintl.h>
+# if defined (__APPLE__) || defined (WIN32)
+#  include "config/configuration.h"
+# endif
 #endif
 
 int vlc_bindtextdomain (const char *domain)
@@ -35,16 +38,15 @@ int vlc_bindtextdomain (const char *domain)
 
 #if defined (ENABLE_NLS)
     /* Specify where to find the locales for current domain */
-# if !defined (__APPLE__) && !defined ( IN32)
+# if !defined (__APPLE__) && !defined (WIN32)
     static const char path[] = LOCALEDIR;
 # else
     char *datadir = config_GetDataDirDefault();
     char *path;
-    int ret;
 
     if (unlikely(datadir == NULL))
         return -1;
-    int ret = asprintf (&path, "%s" DIR_SEP "locale", datadir);
+    ret = asprintf (&path, "%s" DIR_SEP "locale", datadir);
     free (datadir);
 # endif