diff options
| author | Jani Taskinen <jani@php.net> | 2009-12-23 21:06:26 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-12-23 21:06:26 +0000 |
| commit | f0c1cd512f53c787058d40f025bbbed529122309 (patch) | |
| tree | c792d2c072194c04172cd6e1bc15035fec2f7977 | |
| parent | 34dd94b483b5fe484c94543ecbdff9003321b380 (diff) | |
| download | php-git-f0c1cd512f53c787058d40f025bbbed529122309.tar.gz | |
- ws
| -rw-r--r-- | ext/iconv/php_iconv.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h index 98743d8f13..e566d40a2c 100644 --- a/ext/iconv/php_iconv.h +++ b/ext/iconv/php_iconv.h @@ -23,15 +23,15 @@ #define PHP_ICONV_H #ifdef PHP_WIN32 -# ifdef PHP_ICONV_EXPORTS -# define PHP_ICONV_API __declspec(dllexport) -# else -# define PHP_ICONV_API __declspec(dllimport) -# endif +# ifdef PHP_ICONV_EXPORTS +# define PHP_ICONV_API __declspec(dllexport) +# else +# define PHP_ICONV_API __declspec(dllimport) +# endif #elif defined(__GNUC__) && __GNUC__ >= 4 -# define PHP_ICONV_API __attribute__ ((visibility("default"))) +# define PHP_ICONV_API __attribute__ ((visibility("default"))) #else -# define PHP_ICONV_API +# define PHP_ICONV_API #endif #ifdef PHP_ATOM_INC @@ -45,7 +45,6 @@ #include "ext/iconv/php_php_iconv_h_path.h" #endif - #ifdef HAVE_ICONV extern zend_module_entry iconv_module_entry; #define iconv_module_ptr &iconv_module_entry @@ -73,9 +72,9 @@ ZEND_BEGIN_MODULE_GLOBALS(iconv) ZEND_END_MODULE_GLOBALS(iconv) #ifdef ZTS -#define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v) +# define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v) #else -#define ICONVG(v) (iconv_globals.v) +# define ICONVG(v) (iconv_globals.v) #endif #ifdef HAVE_IBM_ICONV @@ -122,7 +121,6 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char * in_p, size_t in_len, #endif /* PHP_ICONV_H */ - /* * Local variables: * tab-width: 4 |