From c7fad16a08152b074e4631aede388588668b9bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sat, 10 Jun 2006 00:21:51 +0000
Subject: Don't trust internal gettext macros, they are unreliable and change
 between versions. Check for nl_langinfo() explicitely and use that instead.

CVS patchset: 8023
CVS date: 2006/06/10 00:21:51
---
 src/input/mms.c                    |  4 ++--
 src/input/vcd/libcdio/iso9660_fs.c | 10 +++++-----
 src/xine-utils/utils.c             |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/input/mms.c b/src/input/mms.c
index aee2d2f5c..48fcbdb30 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: mms.c,v 1.57 2006/04/19 17:30:12 dsalt Exp $
+ * $Id: mms.c,v 1.58 2006/06/10 00:21:51 dgp85 Exp $
  *
  * MMS over TCP protocol
  *   based on work from major mms
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_CODESET)
+#if defined(HAVE_ICONV) && defined(HAVE_NL_LANGINFO)
 #define USE_ICONV
 #include <iconv.h>
 #include <locale.h>
diff --git a/src/input/vcd/libcdio/iso9660_fs.c b/src/input/vcd/libcdio/iso9660_fs.c
index 0f49dfe5e..d4ba945c0 100644
--- a/src/input/vcd/libcdio/iso9660_fs.c
+++ b/src/input/vcd/libcdio/iso9660_fs.c
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660_fs.c,v 1.3 2005/01/01 02:43:57 rockyb Exp $
+    $Id: iso9660_fs.c,v 1.4 2006/06/10 00:21:51 dgp85 Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -35,7 +35,7 @@
 # include <iconv.h>
 #endif
 
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_NL_LANGINFO
 #include <langinfo.h>
 #endif
 
@@ -51,7 +51,7 @@
 
 #include <stdio.h>
 
-static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.3 2005/01/01 02:43:57 rockyb Exp $";
+static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.4 2006/06/10 00:21:51 dgp85 Exp $";
 
 /* Implementation of iso9660_t type */
 struct _iso9660 {
@@ -148,7 +148,7 @@ ucs2be_to_locale(ICONV_CONST char *psz_ucs2be,  size_t i_inlen,
 {
 
   iconv_t ic = 
-#if defined(HAVE_LANGINFO_CODESET)
+#if defined(HAVE_NL_LANGINFO)
     iconv_open(nl_langinfo(CODESET), "UCS-2BE");
 #else 
     iconv_open("ASCII", "UCS-2BE");
@@ -161,7 +161,7 @@ ucs2be_to_locale(ICONV_CONST char *psz_ucs2be,  size_t i_inlen,
   int i_outlen_actual;
 
   if (-1 == (size_t) ic) {
-#if defined(HAVE_LANGINFO_CODESET)
+#if defined(HAVE_NL_LANGINFO)
     cdio_info("Failed to get conversion table for locale, trying ASCII");
     ic = iconv_open("ASCII", "UCS-2BE");
     if (-1 == (size_t) ic) {
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index ee23cae8d..477789e3b 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: utils.c,v 1.43 2006/02/05 16:15:12 miguelfreitas Exp $
+ * $Id: utils.c,v 1.44 2006/06/10 00:21:51 dgp85 Exp $
  *
  */
 #define	_POSIX_PTHREAD_SEMANTICS 1	/* for 5-arg getpwuid_r on solaris */
@@ -50,7 +50,7 @@
 #include <ucontext.h>
 #endif
 
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_NL_LANGINFO
 #include <langinfo.h>
 #endif
 
@@ -531,7 +531,7 @@ static char *_get_lang(void) {
 char *xine_get_system_encoding(void) {
   char *codeset = NULL;
   
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_NL_LANGINFO
   codeset = nl_langinfo(CODESET);
 #endif
   /*
-- 
cgit v1.2.3