sniper Sun Jan 9 16:05:17 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src configure.in
/TSRM TSRM.h tsrm_config_common.h
/ZendEngine2 zend.h
/php-src/ext/bcmath/libbcmath/src config.h
/php-src/ext/gd gdcache.c gdttf.c
/php-src/ext/mcve mcve.c
/php-src/ext/odbc birdstep.c
/php-src/ext/pcre/pcrelib internal.h
/php-src/ext/sqlite config.m4
/php-src/ext/standard html.c
/php-src/main alloca.c php_compat.h php_scandir.c php_scandir.h
php_sprintf.c php_syslog.h
/php-src/sapi/cgi/libfcgi/include fcgi_config.h
Log:
MFH: - Fix outside-source-tree builds. Always include generated header files
with #include <some_header.h> to make sure the correct file is used.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.30&r2=1.514.2.31&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.30 php-src/configure.in:1.514.2.31
--- php-src/configure.in:1.514.2.30 Fri Jan 7 01:19:54 2005
+++ php-src/configure.in Sun Jan 9 16:05:16 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.30 2005/01/07 06:19:54 sniper Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.514.2.31 2005/01/09 21:05:16 sniper Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1305,12 +1305,12 @@
#
test -d TSRM || $php_shtool mkdir TSRM
-echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
+echo '#include <../main/php_config.h>' > TSRM/tsrm_config.h
test -d Zend || $php_shtool mkdir Zend
cat >Zend/zend_config.h <<FEO
-#include "../main/php_config.h"
+#include <../main/php_config.h>
#if defined(APACHE) && defined(PHP_API_VERSION)
#undef HAVE_DLFCN_H
#endif
http://cvs.php.net/diff.php/TSRM/TSRM.h?r1=1.43&r2=1.43.2.1&ty=u
Index: TSRM/TSRM.h
diff -u TSRM/TSRM.h:1.43 TSRM/TSRM.h:1.43.2.1
--- TSRM/TSRM.h:1.43 Wed Dec 3 09:26:41 2003
+++ TSRM/TSRM.h Sun Jan 9 16:05:16 2005
@@ -15,7 +15,7 @@
/* #ifndef WIN32 */
#if !defined(WIN32) && !defined(NETWARE)
-# include "tsrm_config.h"
+# include <tsrm_config.h>
#endif
#ifdef WIN32
http://cvs.php.net/diff.php/TSRM/tsrm_config_common.h?r1=1.13&r2=1.13.2.1&ty=u
Index: TSRM/tsrm_config_common.h
diff -u TSRM/tsrm_config_common.h:1.13 TSRM/tsrm_config_common.h:1.13.2.1
--- TSRM/tsrm_config_common.h:1.13 Mon Aug 25 19:24:29 2003
+++ TSRM/tsrm_config_common.h Sun Jan 9 16:05:16 2005
@@ -10,7 +10,7 @@
#elif defined(NETWARE)
# include "tsrm_config.nw.h"
#else
-# include "tsrm_config.h"
+# include <tsrm_config.h>
# include <sys/param.h>
#endif
http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.257.2.18&r2=1.257.2.19&ty=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.257.2.18 ZendEngine2/zend.h:1.257.2.19
--- ZendEngine2/zend.h:1.257.2.18 Wed Dec 15 02:02:05 2004
+++ ZendEngine2/zend.h Sun Jan 9 16:05:16 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.h,v 1.257.2.18 2004/12/15 07:02:05 andi Exp $ */
+/* $Id: zend.h,v 1.257.2.19 2005/01/09 21:05:16 sniper Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -47,10 +47,10 @@
# include "zend_config.nw.h"
# include "acconfig.h"
#elif defined(__riscos__)
-# include "zend_config.h"
+# include <zend_config.h>
# define ZEND_PATHS_SEPARATOR ';'
#else
-# include "zend_config.h"
+# include <zend_config.h>
# define ZEND_PATHS_SEPARATOR ':'
#endif
http://cvs.php.net/diff.php/php-src/ext/bcmath/libbcmath/src/config.h?r1=1.7&r2=1.7.2.1&ty=u
Index: php-src/ext/bcmath/libbcmath/src/config.h
diff -u php-src/ext/bcmath/libbcmath/src/config.h:1.7
php-src/ext/bcmath/libbcmath/src/config.h:1.7.2.1
--- php-src/ext/bcmath/libbcmath/src/config.h:1.7 Sun Feb 16 22:07:32 2003
+++ php-src/ext/bcmath/libbcmath/src/config.h Sun Jan 9 16:05:16 2005
@@ -3,7 +3,7 @@
#elif defined(NETWARE)
#include "config.nw.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#include "php.h"
http://cvs.php.net/diff.php/php-src/ext/gd/gdcache.c?r1=1.9&r2=1.9.2.1&ty=u
Index: php-src/ext/gd/gdcache.c
diff -u php-src/ext/gd/gdcache.c:1.9 php-src/ext/gd/gdcache.c:1.9.2.1
--- php-src/ext/gd/gdcache.c:1.9 Sun Dec 28 16:08:46 2003
+++ php-src/ext/gd/gdcache.c Sun Jan 9 16:05:16 2005
@@ -1,5 +1,5 @@
/*
- * $Id: gdcache.c,v 1.9 2003/12/28 21:08:46 iliaa Exp $
+ * $Id: gdcache.c,v 1.9.2.1 2005/01/09 21:05:16 sniper Exp $
*
* Caches of pointers to user structs in which the least-recently-used
* element is replaced in the event of a cache miss after the cache has
@@ -42,7 +42,7 @@
#if PHP_WIN32
#define ENABLE_GD_TTF
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#if (HAVE_LIBTTF | HAVE_LIBFREETYPE) && !defined(HAVE_GD_CACHE_CREATE)
http://cvs.php.net/diff.php/php-src/ext/gd/gdttf.c?r1=1.20&r2=1.20.2.1&ty=u
Index: php-src/ext/gd/gdttf.c
diff -u php-src/ext/gd/gdttf.c:1.20 php-src/ext/gd/gdttf.c:1.20.2.1
--- php-src/ext/gd/gdttf.c:1.20 Sun Dec 28 16:08:46 2003
+++ php-src/ext/gd/gdttf.c Sun Jan 9 16:05:16 2005
@@ -2,14 +2,14 @@
/* */
/* John Ellson [EMAIL PROTECTED] */
-/* $Id: gdttf.c,v 1.20 2003/12/28 21:08:46 iliaa Exp $ */
+/* $Id: gdttf.c,v 1.20.2.1 2005/01/09 21:05:16 sniper Exp $ */
#include "php.h"
#if PHP_WIN32
#include "config.w32.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#if HAVE_LIBTTF && !defined(USE_GD_IMGSTRTTF)
#include <stdio.h>
http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.28.2.1&r2=1.28.2.2&ty=u
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.28.2.1 php-src/ext/mcve/mcve.c:1.28.2.2
--- php-src/ext/mcve/mcve.c:1.28.2.1 Tue Dec 7 22:08:38 2004
+++ php-src/ext/mcve/mcve.c Sun Jan 9 16:05:16 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mcve.c,v 1.28.2.1 2004/12/08 03:08:38 bradmssw Exp $ */
+/* $Id: mcve.c,v 1.28.2.2 2005/01/09 21:05:16 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -30,7 +30,7 @@
#elif defined NETWARE
#include "config.nw.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#if HAVE_MCVE
http://cvs.php.net/diff.php/php-src/ext/odbc/birdstep.c?r1=1.11&r2=1.11.2.1&ty=u
Index: php-src/ext/odbc/birdstep.c
diff -u php-src/ext/odbc/birdstep.c:1.11 php-src/ext/odbc/birdstep.c:1.11.2.1
--- php-src/ext/odbc/birdstep.c:1.11 Thu Jan 8 03:16:37 2004
+++ php-src/ext/odbc/birdstep.c Sun Jan 9 16:05:16 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: birdstep.c,v 1.11 2004/01/08 08:16:37 andi Exp $ */
+/* $Id: birdstep.c,v 1.11.2.1 2005/01/09 21:05:16 sniper Exp $ */
/*
* TODO:
@@ -39,7 +39,7 @@
# define PHPAPI __declspec(dllimport)
# endif
#else
-# include "php_config.h"
+# include <php_config.h>
# define PHPAPI
# define THREAD_LS
#endif
http://cvs.php.net/diff.php/php-src/ext/pcre/pcrelib/internal.h?r1=1.15&r2=1.15.2.1&ty=u
Index: php-src/ext/pcre/pcrelib/internal.h
diff -u php-src/ext/pcre/pcrelib/internal.h:1.15
php-src/ext/pcre/pcrelib/internal.h:1.15.2.1
--- php-src/ext/pcre/pcrelib/internal.h:1.15 Tue Dec 16 17:20:29 2003
+++ php-src/ext/pcre/pcrelib/internal.h Sun Jan 9 16:05:16 2005
@@ -42,7 +42,7 @@
#elif defined(NETWARE)
# include "config.nw.h"
#else
-# include "php_config.h"
+# include <php_config.h>
#endif
#ifndef PCRE_SPY
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.27&r2=1.27.2.1&ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.27 php-src/ext/sqlite/config.m4:1.27.2.1
--- php-src/ext/sqlite/config.m4:1.27 Sat Jul 10 08:49:34 2004
+++ php-src/ext/sqlite/config.m4 Sun Jan 9 16:05:16 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.27 2004/07/10 12:49:34 wez Exp $
+dnl $Id: config.m4,v 1.27.2.1 2005/01/09 21:05:16 sniper Exp $
dnl config.m4 for extension sqlite
dnl vim:et:ts=2:sw=2
@@ -91,7 +91,7 @@
sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/
$ext_srcdir/libsqlite/src/sqlite.h.in >$ext_srcdir/libsqlite/src/sqlite.h
if test "$ext_shared" = "no"; then
- echo '#include "php_config.h"' > $ext_srcdir/libsqlite/src/config.h
+ echo '#include <php_config.h>' > $ext_srcdir/libsqlite/src/config.h
else
echo "#include \"$abs_builddir/config.h\"" >
$ext_srcdir/libsqlite/src/config.h
fi
http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.97.2.1&r2=1.97.2.2&ty=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.97.2.1
php-src/ext/standard/html.c:1.97.2.2
--- php-src/ext/standard/html.c:1.97.2.1 Mon Jul 19 13:52:59 2004
+++ php-src/ext/standard/html.c Sun Jan 9 16:05:16 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.97.2.1 2004/07/19 17:52:59 moriyoshi Exp $ */
+/* $Id: html.c,v 1.97.2.2 2005/01/09 21:05:16 sniper Exp $ */
/*
* HTML entity resources:
@@ -35,7 +35,7 @@
#elif defined NETWARE
#include "config.nw.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#include "reg.h"
#include "html.h"
http://cvs.php.net/diff.php/php-src/main/alloca.c?r1=1.7&r2=1.7.2.1&ty=u
Index: php-src/main/alloca.c
diff -u php-src/main/alloca.c:1.7 php-src/main/alloca.c:1.7.2.1
--- php-src/main/alloca.c:1.7 Wed Feb 19 03:40:18 2003
+++ php-src/main/alloca.c Sun Jan 9 16:05:17 2005
@@ -21,9 +21,9 @@
allocating any. It is a good idea to use alloca(0) in
your main control loop, etc. to force garbage collection. */
-/* $Id: alloca.c,v 1.7 2003/02/19 08:40:18 sniper Exp $ */
+/* $Id: alloca.c,v 1.7.2.1 2005/01/09 21:05:17 sniper Exp $ */
-#include "php_config.h"
+#include <php_config.h>
#if !HAVE_ALLOCA
http://cvs.php.net/diff.php/php-src/main/php_compat.h?r1=1.20&r2=1.20.2.1&ty=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.20 php-src/main/php_compat.h:1.20.2.1
--- php-src/main/php_compat.h:1.20 Thu Jan 8 12:33:04 2004
+++ php-src/main/php_compat.h Sun Jan 9 16:05:17 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_compat.h,v 1.20 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: php_compat.h,v 1.20.2.1 2005/01/09 21:05:17 sniper Exp $ */
#ifndef PHP_COMPAT_H
#define PHP_COMPAT_H
@@ -26,7 +26,7 @@
#elif defined(NETWARE)
#include "config.nw.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#if defined(HAVE_BUNDLED_PCRE) || !defined(PHP_VERSION)
http://cvs.php.net/diff.php/php-src/main/php_scandir.c?r1=1.9&r2=1.9.2.1&ty=u
Index: php-src/main/php_scandir.c
diff -u php-src/main/php_scandir.c:1.9 php-src/main/php_scandir.c:1.9.2.1
--- php-src/main/php_scandir.c:1.9 Thu Jan 8 03:17:54 2004
+++ php-src/main/php_scandir.c Sun Jan 9 16:05:17 2005
@@ -17,12 +17,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_scandir.c,v 1.9 2004/01/08 08:17:54 andi Exp $ */
+/* $Id: php_scandir.c,v 1.9.2.1 2005/01/09 21:05:17 sniper Exp $ */
#ifdef PHP_WIN32
#include "config.w32.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#include "php_scandir.h"
http://cvs.php.net/diff.php/php-src/main/php_scandir.h?r1=1.8&r2=1.8.2.1&ty=u
Index: php-src/main/php_scandir.h
diff -u php-src/main/php_scandir.h:1.8 php-src/main/php_scandir.h:1.8.2.1
--- php-src/main/php_scandir.h:1.8 Thu Jan 8 12:33:04 2004
+++ php-src/main/php_scandir.h Sun Jan 9 16:05:17 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_scandir.h,v 1.8 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: php_scandir.h,v 1.8.2.1 2005/01/09 21:05:17 sniper Exp $ */
#ifndef PHP_SCANDIR_H
#define PHP_SCANDIR_H
@@ -32,7 +32,7 @@
#include "config.w32.h"
#include "win32/readdir.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#ifdef HAVE_DIRENT_H
http://cvs.php.net/diff.php/php-src/main/php_sprintf.c?r1=1.17.2.3&r2=1.17.2.4&ty=u
Index: php-src/main/php_sprintf.c
diff -u php-src/main/php_sprintf.c:1.17.2.3 php-src/main/php_sprintf.c:1.17.2.4
--- php-src/main/php_sprintf.c:1.17.2.3 Fri Dec 17 08:08:39 2004
+++ php-src/main/php_sprintf.c Sun Jan 9 16:05:17 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sprintf.c,v 1.17.2.3 2004/12/17 13:08:39 derick Exp $ */
+/* $Id: php_sprintf.c,v 1.17.2.4 2005/01/09 21:05:17 sniper Exp $ */
#include <stdio.h>
#include <stdarg.h>
@@ -26,7 +26,7 @@
#elif defined NETWARE
#include "config.nw.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
PHPAPI int
http://cvs.php.net/diff.php/php-src/main/php_syslog.h?r1=1.9&r2=1.9.2.1&ty=u
Index: php-src/main/php_syslog.h
diff -u php-src/main/php_syslog.h:1.9 php-src/main/php_syslog.h:1.9.2.1
--- php-src/main/php_syslog.h:1.9 Thu Jan 8 12:33:04 2004
+++ php-src/main/php_syslog.h Sun Jan 9 16:05:17 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_syslog.h,v 1.9 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: php_syslog.h,v 1.9.2.1 2005/01/09 21:05:17 sniper Exp $ */
#ifndef PHP_SYSLOG_H
#define PHP_SYSLOG_H
@@ -29,7 +29,7 @@
#include <syslog.h>
#endif
#else
-#include "php_config.h"
+#include <php_config.h>
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
#endif
http://cvs.php.net/diff.php/php-src/sapi/cgi/libfcgi/include/fcgi_config.h?r1=1.3&r2=1.3.2.1&ty=u
Index: php-src/sapi/cgi/libfcgi/include/fcgi_config.h
diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.3
php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.3.2.1
--- php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.3 Tue Feb 10 12:44:31 2004
+++ php-src/sapi/cgi/libfcgi/include/fcgi_config.h Sun Jan 9 16:05:17 2005
@@ -2,6 +2,6 @@
#ifdef _WIN32
#include "fcgi_config_win32.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
