gdbinit

[m6w6/ext-psi] / php_psi.h

diff --git a/php_psi.h b/php_psi.h
index 160970003677ee7b89bfe3e0ff74f3d63f9c0d29..91f303010ab16a4e5cfbbc61775535934e485ebd 100644 (file)
--- a/php_psi.h
+++ b/php_psi.h
@@ -26,6 +26,8 @@
 #ifndef PHP_PSI_H
 #define PHP_PSI_H
 
+#include "php.h"
+
 extern zend_module_entry psi_module_entry;
 #define phpext_psi_ptr &psi_module_entry
 
@@ -59,6 +61,9 @@ static inline psi_object *PSI_OBJ(zval *zv, zend_object *zo) {
        if (zv) {
                zo = Z_OBJ_P(zv);
        }
+       if (!zo) {
+               return NULL;
+       }
        return (void *) (((char *) zo) - zo->handlers->offset);
 }
 
@@ -69,7 +74,13 @@ PHP_PSI_API zend_class_entry *psi_object_get_class_entry();
 ZEND_BEGIN_MODULE_GLOBALS(psi)
        char *engine;
        char *directory;
+       char *search_path;
+       struct psi_context_ops *ops;
        struct psi_context *context;
+       struct {
+               struct psi_plist *decls;
+               struct psi_plist *vars;
+       } blacklist;
 ZEND_END_MODULE_GLOBALS(psi);
 
 ZEND_EXTERN_MODULE_GLOBALS(psi);