diff --git a/mozilla/intl/uconv/src/nsUNIXCharset.cpp b/mozilla/intl/uconv/src/nsUNIXCharset.cpp
index 32631cc9109..2cdcd860748 100644
--- a/mozilla/intl/uconv/src/nsUNIXCharset.cpp
+++ b/mozilla/intl/uconv/src/nsUNIXCharset.cpp
@@ -232,7 +232,7 @@ nsUNIXCharset::InitGetCharset(nsString &oString)
   nsString aCharset;
   nsresult res;
 
-#if HAVE_NL_LANGINFO
+#if HAVE_NL_LANGINFO && defined(CODESET)
   nl_langinfo_codeset = nl_langinfo(CODESET);
   NS_ASSERTION(nl_langinfo_codeset, "cannot get nl_langinfo(CODESET)");