projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
#pragma lib
[m6w6/ext-psi]
/
src
/
types
/
decl.c
diff --git
a/src/types/decl.c
b/src/types/decl.c
index 42eeb43928abe3a964d39f028457673a0a9e981c..f948b014350ad08028d41098457f537cee43ab32 100644
(file)
--- a/
src/types/decl.c
+++ b/
src/types/decl.c
@@
-23,18
+23,21
@@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include "php_psi_stdinc.h"
-#include "php_psi.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
-#include <dlfcn.h>
#include <fnmatch.h>
#include <fnmatch.h>
-
#include <Zend/zend_smart_str.h>
#include <Zend/zend_smart_str.h>
+#include "php_psi.h"
#include "data.h"
#include "data.h"
+#include "dl.h"
#define PSI_FUNC_REDIRS
#define PSI_FUNC_REDIRS
-#include "php_psi_p
osix
.h"
+#include "php_psi_p
redef
.h"
struct psi_decl *psi_decl_init(struct psi_decl_arg *func, struct psi_plist *args)
{
struct psi_decl *psi_decl_init(struct psi_decl_arg *func, struct psi_plist *args)
{
@@
-61,7
+64,7
@@
void psi_decl_free(struct psi_decl **d_ptr)
if (d->redir) {
zend_string_release(d->redir);
}
if (d->redir) {
zend_string_release(d->redir);
}
-
free(d
);
+
pefree(d, 1
);
}
}
}
}
@@
-123,7
+126,7
@@
static inline bool psi_decl_validate_func(struct psi_data *data,
"Failed to locate symbol '%s(%s)': %s",
func->var->name->val,
decl->redir ? decl->redir->val : "",
"Failed to locate symbol '%s(%s)': %s",
func->var->name->val,
decl->redir ? decl->redir->val : "",
- dlerror() ?: "not found");
+
psi_
dlerror() ?: "not found");
return false;
}
return true;
return false;
}
return true;