diff options
| author | Dan Kalowsky <kalowsky@php.net> | 2002-03-04 23:28:17 +0000 |
|---|---|---|
| committer | Dan Kalowsky <kalowsky@php.net> | 2002-03-04 23:28:17 +0000 |
| commit | a3010a9b8f9f75f944c02e3129a8f115efdbbbb3 (patch) | |
| tree | 2b716e0fa676790c68372c25c07c4abb2cd4b970 /ext/iconv/php_iconv.h | |
| parent | ce4bf31268d23a4eb7ca1be953e51550400235c8 (diff) | |
| download | php-git-a3010a9b8f9f75f944c02e3129a8f115efdbbbb3.tar.gz | |
Fix for Bug 14423. Enables FreeBSD to use iconv functionality.
Diffstat (limited to 'ext/iconv/php_iconv.h')
| -rw-r--r-- | ext/iconv/php_iconv.h | 11 |
1 files changed, 10 insertions, 1 deletions
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 */ |