projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
cpp: include psi.directory in cpp search path
[m6w6/ext-psi]
/
src
/
cpp.c
diff --git
a/src/cpp.c
b/src/cpp.c
index c831b67838171f7157a117e30862b91b10d702cc..29f8541afee2f04e3657e2e98bc08cf424651dc8 100644
(file)
--- a/
src/cpp.c
+++ b/
src/cpp.c
@@
-32,6
+32,8
@@
#define PSI_CPP_PREDEF
#include "php_psi_cpp.h"
#define PSI_CPP_PREDEF
#include "php_psi_cpp.h"
+#include "php_psi.h"
+
static void free_cpp_def(zval *p)
{
if (Z_TYPE_P(p) == IS_PTR) {
static void free_cpp_def(zval *p)
{
if (Z_TYPE_P(p) == IS_PTR) {
@@
-449,7
+451,7
@@
bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags)
}
if (!(flags & PSI_CPP_INCLUDE_NEXT) || !cpp->search) {
}
if (!(flags & PSI_CPP_INCLUDE_NEXT) || !cpp->search) {
- cpp->search =
&psi_cpp_search[0]
;
+ cpp->search =
PSI_G(search_path)
;
}
do {
}
do {
@@
-466,7
+468,10
@@
bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags)
break;
}
}
break;
}
}
- cpp->search = sep + 1;
+
+ if (sep) {
+ cpp->search = sep + 1;
+ }
} while (sep);
}
} while (sep);
}