merge r292562: -ws (jani)

diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index 3dab05e82a39805a795ce97d24278b476f07d7dc..b4edb13563e1e90abbdc70bcf23b59683467c6c7 100644 (file)
--- 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