jani Wed, 23 Dec 2009 21:06:26 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292562
Log:
- ws
Changed paths:
U php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h
U php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h
U php/php-src/trunk/ext/iconv/php_iconv.h
Modified: php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h
===================================================================
--- php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h 2009-12-23 21:02:12 UTC
(rev 292561)
+++ php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h 2009-12-23 21:06:26 UTC
(rev 292562)
@@ -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_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 @@
#endif /* PHP_ICONV_H */
-
/*
* Local variables:
* tab-width: 4
Modified: php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h 2009-12-23 21:02:12 UTC
(rev 292561)
+++ php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h 2009-12-23 21:06:26 UTC
(rev 292562)
@@ -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
Modified: php/php-src/trunk/ext/iconv/php_iconv.h
===================================================================
--- php/php-src/trunk/ext/iconv/php_iconv.h 2009-12-23 21:02:12 UTC (rev
292561)
+++ php/php-src/trunk/ext/iconv/php_iconv.h 2009-12-23 21:06:26 UTC (rev
292562)
@@ -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
@@ -72,9 +71,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
@@ -92,7 +91,7 @@
#endif
#ifndef ICONV_CSNMAXLEN
-#define ICONV_CSNMAXLEN 64
+# define ICONV_CSNMAXLEN 64
#endif
/* {{{ typedef enum php_iconv_err_t */
@@ -121,7 +120,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
