X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl.c;h=f948b014350ad08028d41098457f537cee43ab32;hb=e918b10a9b5a8de154d12385665728f7408e5cc7;hp=42eeb43928abe3a964d39f028457673a0a9e981c;hpb=a0f437f26cd0f121ee911a55327a68a3544bf15f;p=m6w6%2Fext-psi

diff --git a/src/types/decl.c b/src/types/decl.c
index 42eeb43..f948b01 100644
--- 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.
  *******************************************************************************/
 
-#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 <Zend/zend_smart_str.h>
 
+#include "php_psi.h"
 #include "data.h"
+#include "dl.h"
 
 #define PSI_FUNC_REDIRS
-#include "php_psi_posix.h"
+#include "php_psi_predef.h"
 
 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);
 		}
-		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 : "",
-				dlerror() ?: "not found");
+				psi_dlerror() ?: "not found");
 		return false;
 	}
 	return true;