sniper Thu Mar 17 03:15:24 2005 EDT
Modified files:
/TSRM TSRM.h tsrm_config_common.h
/php-src/ext/mbstring mb_gpc.c mbstring.c
/php-src/ext/soap php_sdl.c
Log:
Revert bad fix
http://cvs.php.net/diff.php/TSRM/TSRM.h?r1=1.47&r2=1.48&ty=u
Index: TSRM/TSRM.h
diff -u TSRM/TSRM.h:1.47 TSRM/TSRM.h:1.48
--- TSRM/TSRM.h:1.47 Wed Mar 16 17:00:06 2005
+++ TSRM/TSRM.h Thu Mar 17 03:15:22 2005
@@ -15,7 +15,7 @@
/* #ifndef WIN32 */
#ifndef WIN32
-# include "tsrm_config.h"
+# include <tsrm_config.h>
#endif
#ifdef WIN32
http://cvs.php.net/diff.php/TSRM/tsrm_config_common.h?r1=1.16&r2=1.17&ty=u
Index: TSRM/tsrm_config_common.h
diff -u TSRM/tsrm_config_common.h:1.16 TSRM/tsrm_config_common.h:1.17
--- TSRM/tsrm_config_common.h:1.16 Wed Mar 16 17:00:06 2005
+++ TSRM/tsrm_config_common.h Thu Mar 17 03:15:22 2005
@@ -8,7 +8,7 @@
#ifdef TSRM_WIN32
# include "tsrm_config.w32.h"
#else
-# include "tsrm_config.h"
+# include <tsrm_config.h>
# include <sys/param.h>
#endif
http://cvs.php.net/diff.php/php-src/ext/mbstring/mb_gpc.c?r1=1.15&r2=1.16&ty=u
Index: php-src/ext/mbstring/mb_gpc.c
diff -u php-src/ext/mbstring/mb_gpc.c:1.15 php-src/ext/mbstring/mb_gpc.c:1.16
--- php-src/ext/mbstring/mb_gpc.c:1.15 Wed Mar 16 20:14:10 2005
+++ php-src/ext/mbstring/mb_gpc.c Thu Mar 17 03:15:23 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mb_gpc.c,v 1.15 2005/03/17 01:14:10 rasmus Exp $ */
+/* $Id: mb_gpc.c,v 1.16 2005/03/17 08:15:23 sniper Exp $ */
/* {{{ includes */
#ifdef HAVE_CONFIG_H
@@ -39,7 +39,7 @@
#include "rfc1867.h"
#include "php_content_types.h"
#include "SAPI.h"
-#include "TSRM/TSRM.h"
+#include "TSRM.h"
#include "mb_gpc.h"
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.221&r2=1.222&ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.221
php-src/ext/mbstring/mbstring.c:1.222
--- php-src/ext/mbstring/mbstring.c:1.221 Wed Mar 16 20:14:10 2005
+++ php-src/ext/mbstring/mbstring.c Thu Mar 17 03:15:23 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.221 2005/03/17 01:14:10 rasmus Exp $ */
+/* $Id: mbstring.c,v 1.222 2005/03/17 08:15:23 sniper Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -68,7 +68,7 @@
#include "php_content_types.h"
#include "SAPI.h"
#include "php_unicode.h"
-#include "TSRM/TSRM.h"
+#include "TSRM.h"
#include "mb_gpc.h"
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.78&r2=1.79&ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.78 php-src/ext/soap/php_sdl.c:1.79
--- php-src/ext/soap/php_sdl.c:1.78 Wed Mar 16 17:00:07 2005
+++ php-src/ext/soap/php_sdl.c Thu Mar 17 03:15:23 2005
@@ -17,14 +17,14 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_sdl.c,v 1.78 2005/03/16 22:00:07 rasmus Exp $ */
+/* $Id: php_sdl.c,v 1.79 2005/03/17 08:15:23 sniper Exp $ */
#include "php_soap.h"
#include "ext/libxml/php_libxml.h"
#include "libxml/uri.h"
#include "ext/standard/md5.h"
-#include "../../TSRM/tsrm_virtual_cwd.h"
+#include "tsrm_virtual_cwd.h"
#include <sys/types.h>
#include <sys/stat.h>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
