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]
/
php_psi.h
diff --git
a/php_psi.h
b/php_psi.h
index 160970003677ee7b89bfe3e0ff74f3d63f9c0d29..71b554e3937ca33ba61bc4d6bcbec02ec6069678 100644
(file)
--- a/
php_psi.h
+++ b/
php_psi.h
@@
-59,6
+59,9
@@
static inline psi_object *PSI_OBJ(zval *zv, zend_object *zo) {
if (zv) {
zo = Z_OBJ_P(zv);
}
if (zv) {
zo = Z_OBJ_P(zv);
}
+ if (!zo) {
+ return NULL;
+ }
return (void *) (((char *) zo) - zo->handlers->offset);
}
return (void *) (((char *) zo) - zo->handlers->offset);
}
@@
-69,6
+72,7
@@
PHP_PSI_API zend_class_entry *psi_object_get_class_entry();
ZEND_BEGIN_MODULE_GLOBALS(psi)
char *engine;
char *directory;
ZEND_BEGIN_MODULE_GLOBALS(psi)
char *engine;
char *directory;
+ char *search_path;
struct psi_context *context;
ZEND_END_MODULE_GLOBALS(psi);
struct psi_context *context;
ZEND_END_MODULE_GLOBALS(psi);