From: Wez Furlong <wez@php.net>
Date: Wed, 8 Aug 2001 20:00:09 +0000 (+0000)
Subject: Fix probs on OpenBSD-current and RedHat 6.1
X-Git-Tag: BEFORE_EXP_MERGE~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b00809a32285be24a0ad41ecd1f906e719742c86;p=php

Fix probs on OpenBSD-current and RedHat 6.1
---

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 5d1b01fd27..56ee51b495 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -228,7 +228,7 @@ static enum entity_charset determine_charset(char * charset_hint)
 
 	if (strlen(charset_hint) == 0)	{
 		/* try to detect the charset for the locale */
-#if HAVE_NL_LANGINFO
+#if HAVE_NL_LANGINFO && HAVE_LOCALE_H && defined(CODESET)
 		charset_hint = nl_langinfo(CODESET);
 #endif
 #if HAVE_LOCALE_H