rrichards Fri Dec 26 20:28:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/simplexml php_simplexml.h php_simplexml_exports.h
simplexml.c
Log:
MFH: properly export functions
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.20.2.2.2.3.2.3&r2=1.20.2.2.2.3.2.4&diff_format=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.3
php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.4
--- php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.3 Wed Jul 9
21:27:28 2008
+++ php-src/ext/simplexml/php_simplexml.h Fri Dec 26 20:28:43 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.3 2008/07/09 21:27:28 colder Exp $ */
+/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.4 2008/12/26 20:28:43 rrichards Exp $
*/
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -77,7 +77,19 @@
#define SIMPLEXML_G(v) (simplexml_globals.v)
#endif
-ZEND_API zend_class_entry *sxe_get_element_class_entry();
+#ifdef PHP_WIN32
+#ifdef SIMPLEXML_EXPORTS
+#define PHP_SXE_API __declspec(dllexport)
+#else
+#define PHP_SXE_API __declspec(dllimport)
+#endif /* SIMPLEXML_EXPORTS */
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#define PHP_SXE_API __attribute__ ((visibility("default")))
+#else
+#define PHP_SXE_API
+#endif /* PHP_WIN32 */
+
+PHP_SXE_API zend_class_entry *sxe_get_element_class_entry();
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml_exports.h?r1=1.3.2.3.2.1.2.1&r2=1.3.2.3.2.1.2.2&diff_format=u
Index: php-src/ext/simplexml/php_simplexml_exports.h
diff -u php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.3.2.1.2.1
php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.3.2.1.2.2
--- php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.3.2.1.2.1 Mon Dec
31 07:17:13 2007
+++ php-src/ext/simplexml/php_simplexml_exports.h Fri Dec 26 20:28:43 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_simplexml_exports.h,v 1.3.2.3.2.1.2.1 2007/12/31 07:17:13
sebastian Exp $ */
+/* $Id: php_simplexml_exports.h,v 1.3.2.3.2.1.2.2 2008/12/26 20:28:43
rrichards Exp $ */
#ifndef PHP_SIMPLEXML_EXPORTS_H
#define PHP_SIMPLEXML_EXPORTS_H
@@ -39,7 +39,7 @@
} \
}
-ZEND_API zend_object_value sxe_object_new(zend_class_entry *ce TSRMLS_DC);
+PHP_SXE_API zend_object_value sxe_object_new(zend_class_entry *ce TSRMLS_DC);
/* {{{ php_sxe_fetch_object()
*/
static inline php_sxe_object *
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.28&r2=1.151.2.22.2.35.2.29&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.28
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.29
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.28 Wed Nov 19
02:00:53 2008
+++ php-src/ext/simplexml/simplexml.c Fri Dec 26 20:28:43 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.28 2008/11/19 02:00:53 colder Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.29 2008/12/26 20:28:43 rrichards Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -40,7 +40,7 @@
zend_class_entry *sxe_class_entry = NULL;
-ZEND_API zend_class_entry *sxe_get_element_class_entry() /* {{{ */
+PHP_SXE_API zend_class_entry *sxe_get_element_class_entry() /* {{{ */
{
return sxe_class_entry;
}
@@ -2082,7 +2082,7 @@
/* {{{ sxe_object_new()
*/
-ZEND_API zend_object_value
+PHP_SXE_API zend_object_value
sxe_object_new(zend_class_entry *ce TSRMLS_DC)
{
php_sxe_object *intern;
@@ -2344,7 +2344,7 @@
}
/* }}} */
-ZEND_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC) /*
{{{ */
+PHP_SXE_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC)
/* {{{ */
{
xmlNodePtr node = NULL;
php_sxe_object *intern;
@@ -2555,7 +2555,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision:
1.151.2.22.2.35.2.28 $");
+ php_info_print_table_row(2, "Revision", "$Revision:
1.151.2.22.2.35.2.29 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
