Skip to content

Commit aa8486e

Browse files
committed
Include config.h with the brackets form
`#include "config.h"` searches in the directory containing the including-file before any other include path. This can include the wrong config.h when building out of tree and a config.h exists in the source tree. Using `#include <config.h>` uses exclusively the include path, and gives priority to the build dir.
1 parent dada90e commit aa8486e

File tree

207 files changed

+209
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+209
-209
lines changed

TSRM/TSRM.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
#if !defined(__CYGWIN__) && defined(WIN32)
1717
# define TSRM_WIN32
18-
# include "Zend/zend_config.w32.h"
18+
# include <Zend/zend_config.w32.h>
1919
#else
20-
# include "main/php_config.h"
20+
# include <main/php_config.h>
2121
#endif
2222

2323
#include <stdint.h>

ext/bcmath/bcmath.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/bcmath/libbcmath/src/bcmath.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ typedef struct bc_struct {
5252
} bc_struct;
5353

5454
#ifdef HAVE_CONFIG_H
55-
#include "config.h"
55+
#include <config.h>
5656
#endif
5757

5858
#include "zend.h"

ext/bz2/bz2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/bz2/bz2_filter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/calendar/calendar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
#ifdef HAVE_CONFIG_H
21-
#include "config.h"
21+
#include <config.h>
2222
#endif
2323

2424
#include "php.h"

ext/com_dotnet/com_com.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/com_dotnet/com_dotnet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/com_dotnet/com_extension.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include <intsafe.h>

ext/com_dotnet/com_handlers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/com_dotnet/com_iterator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/com_dotnet/com_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/com_dotnet/com_olechar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#ifdef HAVE_CONFIG_H
19-
#include "config.h"
19+
#include <config.h>
2020
#endif
2121

2222
#include "php.h"

ext/com_dotnet/com_persist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* (can wait till 5.1) */
2121

2222
#ifdef HAVE_CONFIG_H
23-
#include "config.h"
23+
#include <config.h>
2424
#endif
2525

2626
#include "php.h"

ext/com_dotnet/com_saproxy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* */
2323

2424
#ifdef HAVE_CONFIG_H
25-
#include "config.h"
25+
#include <config.h>
2626
#endif
2727

2828
#include "php.h"

ext/com_dotnet/com_typeinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#ifdef HAVE_CONFIG_H
19-
#include "config.h"
19+
#include <config.h>
2020
#endif
2121

2222
#include "php.h"

ext/com_dotnet/com_variant.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/com_dotnet/com_wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* using IDispatchEx */
1919

2020
#ifdef HAVE_CONFIG_H
21-
#include "config.h"
21+
#include <config.h>
2222
#endif
2323

2424
#include "php.h"

ext/ctype/ctype.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/curl/interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
1818

1919
#ifdef HAVE_CONFIG_H
20-
#include "config.h"
20+
#include <config.h>
2121
#endif
2222

2323
#include "php.h"

ext/curl/multi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
1818

1919
#ifdef HAVE_CONFIG_H
20-
#include "config.h"
20+
#include <config.h>
2121
#endif
2222

2323
#include "php.h"

ext/curl/share.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
1818

1919
#ifdef HAVE_CONFIG_H
20-
#include "config.h"
20+
#include <config.h>
2121
#endif
2222

2323
#include "php.h"

ext/dba/dba.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#ifdef HAVE_CONFIG_H
19-
#include "config.h"
19+
#include <config.h>
2020
#endif
2121

2222
#include "php.h"

ext/dba/dba_cdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#ifdef HAVE_CONFIG_H
19-
#include "config.h"
19+
#include <config.h>
2020
#endif
2121

2222
#include "php.h"

ext/dba/dba_db1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_db2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_db3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_db4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#ifdef HAVE_CONFIG_H
19-
#include "config.h"
19+
#include <config.h>
2020
#endif
2121

2222
#include "php.h"

ext/dba/dba_dbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_flatfile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_gdbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_inifile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_lmdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_ndbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_qdbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/dba_tcadb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
18+
#include <config.h>
1919
#endif
2020

2121
#include "php.h"

ext/dba/libcdb/cdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
2020

2121
#ifdef HAVE_CONFIG_H
22-
#include "config.h"
22+
#include <config.h>
2323
#endif
2424

2525
#include "php.h"

ext/dba/libcdb/cdb_make.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
2020

2121
#ifdef HAVE_CONFIG_H
22-
#include "config.h"
22+
#include <config.h>
2323
#endif
2424

2525
#include "php.h"

ext/dba/libcdb/uint32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
1818

1919
#ifdef HAVE_CONFIG_H
20-
#include "config.h"
20+
#include <config.h>
2121
#endif
2222

2323
#include "php.h"

ext/dba/libflatfile/flatfile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/* $Id$ */
2121

2222
#ifdef HAVE_CONFIG_H
23-
#include "config.h"
23+
#include <config.h>
2424
#endif
2525

2626
#include "php.h"

ext/dba/libinifile/inifile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/* $Id$ */
1818

1919
#ifdef HAVE_CONFIG_H
20-
#include "config.h"
20+
#include <config.h>
2121
#endif
2222

2323
#include "php.h"

ext/dom/attr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#ifdef HAVE_CONFIG_H
19-
#include "config.h"
19+
#include <config.h>
2020
#endif
2121

2222
#include "php.h"

ext/dom/cdatasection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#ifdef HAVE_CONFIG_H
19-
#include "config.h"
19+
#include <config.h>
2020
#endif
2121

2222
#include "php.h"

ext/dom/characterdata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#ifdef HAVE_CONFIG_H
19-
#include "config.h"
19+
#include <config.h>
2020
#endif
2121

2222
#include "php.h"

0 commit comments

Comments
 (0)