[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.w32 php_simplexml.h

2008-12-27 Thread Rob Richards
rrichards   Sat Dec 27 12:22:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 php_simplexml.h 
  Log:
  MFH: proper exports/imports for win32
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.6r2=1.4.8.7diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.6 
php-src/ext/simplexml/config.w32:1.4.8.7
--- php-src/ext/simplexml/config.w32:1.4.8.6Fri Dec 26 14:13:38 2008
+++ php-src/ext/simplexml/config.w32Sat Dec 27 12:22:38 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.8.6 2008/12/26 14:13:38 pajoye Exp $
+// $Id: config.w32,v 1.4.8.7 2008/12/27 12:22:38 rrichards Exp $
 // vim:ft=javascript
 
 ARG_WITH(simplexml, Simple XML support, yes);
@@ -15,6 +15,7 @@
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE(\tSPL support in simplexml disabled);
}
+   ADD_FLAG(CFLAGS_SIMPLEXML, /D PHP_SIMPLEXML_EXPORTS );
} else {
PHP_SIMPLEXML == no;
WARNING(simplexml not enabled; libraries and headers not 
found);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.20.2.2.2.3.2.5r2=1.20.2.2.2.3.2.6diff_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.5 
php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.6
--- php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.5  Sat Dec 27 
01:07:49 2008
+++ php-src/ext/simplexml/php_simplexml.h   Sat Dec 27 12:22:38 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.5 2008/12/27 01:07:49 rrichards Exp $ 
*/
+/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.6 2008/12/27 12:22:38 rrichards Exp $ 
*/
 
 #ifndef PHP_SIMPLEXML_H
 #define PHP_SIMPLEXML_H
@@ -77,7 +77,15 @@
 #define SIMPLEXML_G(v) (simplexml_globals.v)
 #endif
 
-#define PHP_SXE_API ZEND_DLEXPORT
+#ifdef PHP_WIN32
+#  ifdef PHP_SIMPLEXML_EXPORTS
+#  define PHP_SXE_API __declspec(dllexport)
+#  else
+#  define PHP_SXE_API __declspec(dllimport)
+#  endif
+#else
+#  define PHP_SXE_API ZEND_API
+#endif
 
 PHP_SXE_API zend_class_entry *sxe_get_element_class_entry();
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.w32

2008-12-26 Thread Pierre-Alain Joye
pajoye  Fri Dec 26 14:13:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 
  Log:
  - remove the temp hack for libxml path (fixed now)
  - do not raise a warning if the extension was not enabled anyway
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.5r2=1.4.8.6diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.5 
php-src/ext/simplexml/config.w32:1.4.8.6
--- php-src/ext/simplexml/config.w32:1.4.8.5Thu Dec 25 01:00:26 2008
+++ php-src/ext/simplexml/config.w32Fri Dec 26 14:13:38 2008
@@ -1,23 +1,22 @@
-// $Id: config.w32,v 1.4.8.5 2008/12/25 01:00:26 pajoye Exp $
+// $Id: config.w32,v 1.4.8.6 2008/12/26 14:13:38 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(simplexml, Simple XML support, yes);
 
-if (PHP_SIMPLEXML == yes  PHP_LIBXML == yes
+if (PHP_SIMPLEXML == yes) {
+   if(PHP_LIBXML == yes
 ADD_EXTENSION_DEP('simplexml', 'libxml')) {
-   EXTENSION(simplexml, simplexml.c sxe.c);
-   AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
-   if (!PHP_SIMPLEXML_SHARED) {
-   ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
-   }
-   
-   // be tricky for now, we actually need a macro like the one in m4 
(PHP_SETUP_LIBXML)
-   ADD_FLAG(CFLAGS_SIMPLEXML, $(CFLAGS_LIBXML));
+   EXTENSION(simplexml, simplexml.c sxe.c);
+   AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
+   if (!PHP_SIMPLEXML_SHARED) {
+   ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
+   }
 
-   if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
-   MESSAGE(\tSPL support in simplexml disabled);
+   if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
+   MESSAGE(\tSPL support in simplexml disabled);
+   }
+   } else {
+   PHP_SIMPLEXML == no;
+   WARNING(simplexml not enabled; libraries and headers not 
found);
}
-} else {
-   PHP_SIMPLEXML == no;
-   WARNING(simplexml not enabled; libraries and headers not found);
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.w32

2008-12-24 Thread Pierre-Alain Joye
pajoye  Thu Dec 25 00:01:10 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 
  Log:
  - MFH: disable simplexml when libxml is not enabled
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.2r2=1.4.8.3diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.2 
php-src/ext/simplexml/config.w32:1.4.8.3
--- php-src/ext/simplexml/config.w32:1.4.8.2Thu Nov  6 00:37:13 2008
+++ php-src/ext/simplexml/config.w32Thu Dec 25 00:01:10 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.4.8.2 2008/11/06 00:37:13 colder Exp $
+// $Id: config.w32,v 1.4.8.3 2008/12/25 00:01:10 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(simplexml, Simple XML support, yes);
 
 if (PHP_SIMPLEXML == yes  PHP_LIBXML == yes
- ADD_EXTENSION_DEP('simplexml', 'libxml')) {
+ADD_EXTENSION_DEP('simplexml', 'libxml')) {
EXTENSION(simplexml, simplexml.c sxe.c);
AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
if (!PHP_SIMPLEXML_SHARED) {
@@ -13,6 +13,9 @@
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE(\tSPL support in simplexml disabled);
}
+} else {
+   PHP_SIMPLEXML == no;
+   WARNING(simplexml not enabled; libraries and headers not found);
 }
 
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.w32

2008-12-24 Thread Pierre-Alain Joye
pajoye  Thu Dec 25 00:47:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 
  Log:
  - work around missing libxml include path (will be replaced by a 
PHP_SETUP_LIBXML macro)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.3r2=1.4.8.4diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.3 
php-src/ext/simplexml/config.w32:1.4.8.4
--- php-src/ext/simplexml/config.w32:1.4.8.3Thu Dec 25 00:01:10 2008
+++ php-src/ext/simplexml/config.w32Thu Dec 25 00:47:32 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.8.3 2008/12/25 00:01:10 pajoye Exp $
+// $Id: config.w32,v 1.4.8.4 2008/12/25 00:47:32 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(simplexml, Simple XML support, yes);
@@ -9,6 +9,8 @@
AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
if (!PHP_SIMPLEXML_SHARED) {
ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
+// be tricky for now, we actually need a macro like the one in m4 
(PHP_SETUP_LIBXML)
+   ADD_FLAG(CFLAGS_SIMPLEXML, $(CFLAGS_LIBXML));
}
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE(\tSPL support in simplexml disabled);
@@ -17,5 +19,3 @@
PHP_SIMPLEXML == no;
WARNING(simplexml not enabled; libraries and headers not found);
 }
-
-



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.w32

2008-12-24 Thread Pierre-Alain Joye
pajoye  Thu Dec 25 01:00:26 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  config.w32 
  Log:
  - add libxml cflag for shared and static
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.4r2=1.4.8.5diff_format=u
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.4.8.4 
php-src/ext/simplexml/config.w32:1.4.8.5
--- php-src/ext/simplexml/config.w32:1.4.8.4Thu Dec 25 00:47:32 2008
+++ php-src/ext/simplexml/config.w32Thu Dec 25 01:00:26 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.8.4 2008/12/25 00:47:32 pajoye Exp $
+// $Id: config.w32,v 1.4.8.5 2008/12/25 01:00:26 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(simplexml, Simple XML support, yes);
@@ -9,9 +9,11 @@
AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
if (!PHP_SIMPLEXML_SHARED) {
ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
-// be tricky for now, we actually need a macro like the one in m4 
(PHP_SETUP_LIBXML)
-   ADD_FLAG(CFLAGS_SIMPLEXML, $(CFLAGS_LIBXML));
}
+   
+   // be tricky for now, we actually need a macro like the one in m4 
(PHP_SETUP_LIBXML)
+   ADD_FLAG(CFLAGS_SIMPLEXML, $(CFLAGS_LIBXML));
+
if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) {
MESSAGE(\tSPL support in simplexml disabled);
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php