Skip to content

Commit a139dbf

Browse files
author
foobar
committed
- Fix outside-source-tree builds. Always include generated header files
with #include <some_header.h> to make sure the correct file is used.
1 parent 37d3ea8 commit a139dbf

File tree

18 files changed

+20
-20
lines changed

18 files changed

+20
-20
lines changed

Diff for: TSRM/TSRM.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
/* #ifndef WIN32 */
1717
#if !defined(WIN32) && !defined(NETWARE)
18-
# include "tsrm_config.h"
18+
# include <tsrm_config.h>
1919
#endif
2020

2121
#ifdef WIN32

Diff for: TSRM/tsrm_config_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#elif defined(NETWARE)
1111
# include "tsrm_config.nw.h"
1212
#else
13-
# include "tsrm_config.h"
13+
# include <tsrm_config.h>
1414
# include <sys/param.h>
1515
#endif
1616

Diff for: Zend/zend.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
# include "acconfig.h"
4949
# define ZEND_PATHS_SEPARATOR ';'
5050
#elif defined(__riscos__)
51-
# include "zend_config.h"
51+
# include <zend_config.h>
5252
# define ZEND_PATHS_SEPARATOR ';'
5353
#else
54-
# include "zend_config.h"
54+
# include <zend_config.h>
5555
# define ZEND_PATHS_SEPARATOR ':'
5656
#endif
5757

Diff for: configure.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1338,12 +1338,12 @@ fi
13381338
#
13391339
13401340
test -d TSRM || $php_shtool mkdir TSRM
1341-
echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
1341+
echo '#include <../main/php_config.h>' > TSRM/tsrm_config.h
13421342
13431343
test -d Zend || $php_shtool mkdir Zend
13441344
13451345
cat >Zend/zend_config.h <<FEO
1346-
#include "../main/php_config.h"
1346+
#include <../main/php_config.h>
13471347
#if defined(APACHE) && defined(PHP_API_VERSION)
13481348
#undef HAVE_DLFCN_H
13491349
#endif

Diff for: ext/bcmath/libbcmath/src/config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#elif defined(NETWARE)
44
#include "config.nw.h"
55
#else
6-
#include "php_config.h"
6+
#include <php_config.h>
77
#endif
88

99
#include "php.h"

Diff for: ext/gd/gdcache.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#if PHP_WIN32
4343
#define ENABLE_GD_TTF
4444
#else
45-
#include "php_config.h"
45+
#include <php_config.h>
4646
#endif
4747
#if (HAVE_LIBTTF | HAVE_LIBFREETYPE) && !defined(HAVE_GD_CACHE_CREATE)
4848

Diff for: ext/gd/gdttf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#if PHP_WIN32
1010
#include "config.w32.h"
1111
#else
12-
#include "php_config.h"
12+
#include <php_config.h>
1313
#endif
1414
#if HAVE_LIBTTF && !defined(USE_GD_IMGSTRTTF)
1515
#include <stdio.h>

Diff for: ext/mcve/mcve.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#elif defined NETWARE
3131
#include "config.nw.h"
3232
#else
33-
#include "php_config.h"
33+
#include <php_config.h>
3434
#endif
3535

3636
#if HAVE_MCVE

Diff for: ext/odbc/birdstep.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# define PHPAPI __declspec(dllimport)
4040
# endif
4141
#else
42-
# include "php_config.h"
42+
# include <php_config.h>
4343
# define PHPAPI
4444
# define THREAD_LS
4545
#endif

Diff for: ext/pcre/pcrelib/internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ modules, but which are not relevant to the outside. */
4242
#elif defined(NETWARE)
4343
# include "config.nw.h"
4444
#else
45-
# include "php_config.h"
45+
# include <php_config.h>
4646
#endif
4747

4848
#ifndef PCRE_SPY

Diff for: ext/sqlite/config.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if test "$PHP_SQLITE" != "no"; then
9191
sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in >$ext_srcdir/libsqlite/src/sqlite.h
9292

9393
if test "$ext_shared" = "no"; then
94-
echo '#include "php_config.h"' > $ext_srcdir/libsqlite/src/config.h
94+
echo '#include <php_config.h>' > $ext_srcdir/libsqlite/src/config.h
9595
else
9696
echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/libsqlite/src/config.h
9797
fi

Diff for: ext/standard/html.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#elif defined NETWARE
3636
#include "config.nw.h"
3737
#else
38-
#include "php_config.h"
38+
#include <php_config.h>
3939
#endif
4040
#include "reg.h"
4141
#include "html.h"

Diff for: main/alloca.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/* $Id$ */
2525

26-
#include "php_config.h"
26+
#include <php_config.h>
2727

2828
#if !HAVE_ALLOCA
2929

Diff for: main/php_compat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#elif defined(NETWARE)
2727
#include "config.nw.h"
2828
#else
29-
#include "php_config.h"
29+
#include <php_config.h>
3030
#endif
3131

3232
#if defined(HAVE_BUNDLED_PCRE) || !defined(PHP_VERSION)

Diff for: main/php_scandir.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#elif NETWARE
3535
#include "config.nw.h"
3636
#else
37-
#include "php_config.h"
37+
#include <php_config.h>
3838
#endif
3939

4040
#ifdef HAVE_DIRENT_H

Diff for: main/php_sprintf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#elif defined NETWARE
2727
#include "config.nw.h"
2828
#else
29-
#include "php_config.h"
29+
#include <php_config.h>
3030
#endif
3131

3232
PHPAPI int

Diff for: main/php_syslog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <syslog.h>
3030
#endif
3131
#else
32-
#include "php_config.h"
32+
#include <php_config.h>
3333
#ifdef HAVE_SYSLOG_H
3434
#include <syslog.h>
3535
#endif

Diff for: sapi/cgi/libfcgi/include/fcgi_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#ifdef _WIN32
33
#include "fcgi_config_win32.h"
44
#else
5-
#include "php_config.h"
5+
#include <php_config.h>
66
#endif
77

0 commit comments

Comments
 (0)