From a3010a9b8f9f75f944c02e3129a8f115efdbbbb3 Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Mon, 4 Mar 2002 23:28:17 +0000 Subject: Fix for Bug 14423. Enables FreeBSD to use iconv functionality. --- ext/iconv/php_iconv.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'ext/iconv/php_iconv.h') diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h index 589b63c03c..4e38380f80 100644 --- a/ext/iconv/php_iconv.h +++ b/ext/iconv/php_iconv.h @@ -26,8 +26,9 @@ #define PHP_ICONV_API #endif +#if HAVE_ICONV extern zend_module_entry iconv_module_entry; -#define phpext_iconv_ptr &iconv_module_entry +#define iconv_module_ptr &iconv_module_entry PHP_MINIT_FUNCTION(miconv); PHP_MSHUTDOWN_FUNCTION(miconv); @@ -54,6 +55,14 @@ ZEND_END_MODULE_GLOBALS(iconv) #define ICONV_OUTPUT_ENCODING "ISO-8859-1" #define ICONV_INTERNAL_ENCODING "ISO-8859-1" +#else + +#define iconv_module_ptr NULL + +#endif /* HAVE_ICONV */ + +#define phpext_iconv_ptr iconv_module_ptr + #endif /* PHP_ICONV_H */ -- cgit v1.2.1