From: Jani Taskinen <jani@php.net>
Date: Wed, 23 Dec 2009 21:06:26 +0000 (+0000)
Subject: - ws
X-Git-Tag: php-5.2.13RC1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af58149827b58097433046eefd802322c9005a39;p=php

- ws
---

diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index c1b3d9ed0e..8d6de86f27 100644
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -23,13 +23,13 @@
 #define PHP_ICONV_H
 
 #ifdef PHP_WIN32
-#ifdef PHP_ICONV_EXPORTS
-#define PHP_ICONV_API __declspec(dllexport)
+# ifdef PHP_ICONV_EXPORTS
+#  define PHP_ICONV_API __declspec(dllexport)
+# else
+#  define PHP_ICONV_API __declspec(dllimport)
+# endif 
 #else
-#define PHP_ICONV_API __declspec(dllimport)
-#endif 
-#else
-#define PHP_ICONV_API
+# define PHP_ICONV_API
 #endif
 
 #ifdef PHP_ATOM_INC
@@ -42,7 +42,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
@@ -70,9 +69,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
 
 #define ICONV_INPUT_ENCODING "ISO-8859-1" 
@@ -109,7 +108,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