johannes Mon, 25 Jan 2010 13:55:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293978
Log:
merge r292562: -ws (jani)
Changed paths:
U php/php-src/branches/PHP_5_3_2/ext/iconv/php_iconv.h
Modified: php/php-src/branches/PHP_5_3_2/ext/iconv/php_iconv.h
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/iconv/php_iconv.h 2010-01-25
13:49:47 UTC (rev 293977)
+++ php/php-src/branches/PHP_5_3_2/ext/iconv/php_iconv.h 2010-01-25
13:55:41 UTC (rev 293978)
@@ -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_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 @@
#endif /* PHP_ICONV_H */
-
/*
* Local variables:
* tab-width: 4
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
