From: foobar <sniper@php.net>
Date: Sun, 9 Jan 2005 21:05:39 +0000 (+0000)
Subject: MFH: - Fix outside-source-tree builds. Always include generated header files
X-Git-Tag: php-4.3.11RC1~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=176a6e48ec78a5b745b657b93cc835dd9532923f;p=php

MFH: - Fix outside-source-tree builds. Always include generated header files
       with #include <some_header.h> to make sure the correct file is used.
---

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index a80500d6db..46f9702bd2 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -15,7 +15,7 @@
 
 /* #ifndef WIN32 */
 #if !defined(WIN32) && !defined(NETWARE)
-# include "tsrm_config.h"
+# include <tsrm_config.h>
 #endif
 
 #ifdef WIN32
diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h
index 24410963e3..23dc9bfd79 100644
--- a/TSRM/tsrm_config_common.h
+++ b/TSRM/tsrm_config_common.h
@@ -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
 
diff --git a/ext/bcmath/libbcmath/src/config.h b/ext/bcmath/libbcmath/src/config.h
index 6516f8f19b..24bf4ec29a 100644
--- a/ext/bcmath/libbcmath/src/config.h
+++ b/ext/bcmath/libbcmath/src/config.h
@@ -3,7 +3,7 @@
 #elif defined(NETWARE)
 #include "config.nw.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 #include <string.h>
diff --git a/ext/gd/gdcache.c b/ext/gd/gdcache.c
index e3ff9b83ad..00707586c3 100644
--- a/ext/gd/gdcache.c
+++ b/ext/gd/gdcache.c
@@ -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)
 
diff --git a/ext/gd/gdttf.c b/ext/gd/gdttf.c
index 4ff659cada..5771d66fbd 100644
--- a/ext/gd/gdttf.c
+++ b/ext/gd/gdttf.c
@@ -9,7 +9,7 @@
 #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>
diff --git a/ext/mcve/mcve.c b/ext/mcve/mcve.c
index 19f555c567..8d2934254d 100644
--- a/ext/mcve/mcve.c
+++ b/ext/mcve/mcve.c
@@ -30,7 +30,7 @@
 #elif defined NETWARE
 #include "config.nw.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 #if HAVE_MCVE
diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
index e1ed5f15d8..d9bb3467a2 100644
--- a/ext/odbc/birdstep.c
+++ b/ext/odbc/birdstep.c
@@ -39,7 +39,7 @@
 #  define PHPAPI __declspec(dllimport) 
 # endif
 #else
-# include "php_config.h"
+# include <php_config.h>
 # define PHPAPI
 # define THREAD_LS
 #endif
diff --git a/ext/pcre/pcrelib/internal.h b/ext/pcre/pcrelib/internal.h
index 544f1c2736..43039570f0 100644
--- a/ext/pcre/pcrelib/internal.h
+++ b/ext/pcre/pcrelib/internal.h
@@ -42,7 +42,7 @@ modules, but which are not relevant to the outside. */
 #elif defined(NETWARE)
 # include "config.nw.h"
 #else
-# include "php_config.h"
+# include <php_config.h>
 #endif
 
 #ifndef PCRE_SPY
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 9f0ae15e2c..9dce03a0ae 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -33,7 +33,7 @@
 #if PHP_WIN32
 #include "config.w32.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 #include "reg.h"
 #include "html.h"
diff --git a/main/alloca.c b/main/alloca.c
index 65e3f7f5e9..66e001b900 100644
--- a/main/alloca.c
+++ b/main/alloca.c
@@ -21,7 +21,7 @@
    allocating any.  It is a good idea to use alloca(0) in
    your main control loop, etc. to force garbage collection.  */
 
-#include "php_config.h"
+#include <php_config.h>
 
 #if !HAVE_ALLOCA
 
diff --git a/main/php_compat.h b/main/php_compat.h
index 3215d58f6f..6725c4fdb8 100644
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -6,7 +6,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)
diff --git a/main/php_scandir.c b/main/php_scandir.c
index 139e1c27cb..bd5848e882 100644
--- a/main/php_scandir.c
+++ b/main/php_scandir.c
@@ -22,7 +22,7 @@
 #ifdef PHP_WIN32
 #include "config.w32.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 #include "php_scandir.h"
diff --git a/main/php_scandir.h b/main/php_scandir.h
index 416e3d88cf..379a7877e6 100644
--- a/main/php_scandir.h
+++ b/main/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
diff --git a/main/php_syslog.h b/main/php_syslog.h
index 92b09800fb..1e5cedf74f 100644
--- a/main/php_syslog.h
+++ b/main/php_syslog.h
@@ -9,7 +9,7 @@
 #include <syslog.h>
 #endif
 #else
-#include "php_config.h"
+#include <php_config.h>
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif
diff --git a/sapi/cgi/libfcgi/include/fcgi_config.h b/sapi/cgi/libfcgi/include/fcgi_config.h
index 7ad81663e4..eb592b0db6 100644
--- a/sapi/cgi/libfcgi/include/fcgi_config.h
+++ b/sapi/cgi/libfcgi/include/fcgi_config.h
@@ -2,6 +2,6 @@
 #ifdef _WIN32
 #include "fcgi_config_win32.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif