cvs: php-src /ext/soap php_soap.h soap.c

bfrance Thu Jun 16 18:35:15 2005 EDT Modified files: /php-src/ext/soap php_soap.h soap.c Log: ifdef'ed the code but not the includes http://cvs.php.net/diff.php/php-src/ext/soap/php_soap.h?r1=1.36&r2=1.37&ty=u Index: php-src/ext/soap/php_soap.h diff -u php-src/ext/soap/php_soap.h:1.36 php-src/ext/soap/php_soap.h:1.37 --- php-src/ext/soap/php_soap.h:1.36 Wed Feb 2 05:34:39 2005 +++ php-src/ext/soap/php_soap.h Thu Jun 16 18:35:11 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_soap.h,v 1.36 2005/02/02 10:34:39 dmitry Exp $ */ +/* $Id: php_soap.h,v 1.37 2005/06/16 22:35:11 bfrance Exp $ */ #ifndef PHP_SOAP_H #define PHP_SOAP_H @@ -26,7 +26,9 @@ #include "php_globals.h" #include "ext/standard/info.h" #include "ext/standard/php_standard.h" +#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) #include "ext/session/php_session.h" +#endif #include "ext/standard/php_smart_str.h" #include "php_ini.h" #include "SAPI.h" http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.151&r2=1.152&ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.151 php-src/ext/soap/soap.c:1.152 --- php-src/ext/soap/soap.c:1.151 Fri Jun 3 03:34:49 2005 +++ php-src/ext/soap/soap.c Thu Jun 16 18:35:11 2005 @@ -17,13 +17,15 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.151 2005/06/03 07:34:49 gschlossnagle Exp $ */ +/* $Id: soap.c,v 1.152 2005/06/16 22:35:11 bfrance Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "php_soap.h" +#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) #include "ext/session/php_session.h" +#endif #ifdef ZEND_ENGINE_2 # include "zend_exceptions.h" #endif