Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- Fix outside-source-tree builds. Always include generated header files

  with #include <some_header.h> to make sure the correct file is used.
  • Loading branch information...
commit a139dbf9ccf47a99b449c7bdcdfb846563bb7cec 1 parent 37d3ea8
foobar authored
View
2  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
View
2  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
View
4 Zend/zend.h
@@ -48,10 +48,10 @@
# include "acconfig.h"
# define ZEND_PATHS_SEPARATOR ';'
#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
View
4 configure.in
@@ -1338,12 +1338,12 @@ fi
#
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
View
2  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 "php.h"
View
2  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)
View
2  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>
View
2  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
View
2  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
View
2  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
View
2  ext/sqlite/config.m4
@@ -91,7 +91,7 @@ if test "$PHP_SQLITE" != "no"; then
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
View
2  ext/standard/html.c
@@ -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"
View
2  main/alloca.c
@@ -23,7 +23,7 @@
/* $Id$ */
-#include "php_config.h"
+#include <php_config.h>
#if !HAVE_ALLOCA
View
2  main/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)
View
2  main/php_scandir.h
@@ -34,7 +34,7 @@
#elif NETWARE
#include "config.nw.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
#ifdef HAVE_DIRENT_H
View
2  main/php_sprintf.c
@@ -26,7 +26,7 @@
#elif defined NETWARE
#include "config.nw.h"
#else
-#include "php_config.h"
+#include <php_config.h>
#endif
PHPAPI int
View
2  main/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
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.