X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fcall.c;h=a46fa4e325196c26edb2e06e9989facb81f5524d;hb=2cef1aee122dcdcf0d1a63a45528fdcb0ee4221e;hp=57b57f0b9d6e8abf640710887ed459c138bd3e54;hpb=a0f437f26cd0f121ee911a55327a68a3544bf15f;p=m6w6%2Fext-psi

diff --git a/src/call.c b/src/call.c
index 57b57f0..a46fa4e 100644
--- a/src/call.c
+++ b/src/call.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "context.h"
 #include "data.h"
 #include "call.h"
@@ -198,7 +202,7 @@ zval *psi_call_frame_sub_argument(struct psi_call_frame *frame,
 	if (!iarg) {
 		struct psi_call_frame_argument *frame_arg;
 		impl_val empty_val = {0};
-		zend_string *type_str = zend_string_init_interned(ZEND_STRL("mixed"), 1);
+		zend_string *type_str = psi_string_init_interned(ZEND_STRL("mixed"), 1);
 		struct psi_impl_arg *carg_spec = psi_impl_arg_init(
 				psi_impl_type_init(PSI_T_MIXED, type_str),
 				psi_impl_var_copy(inner_var), NULL);
@@ -472,6 +476,7 @@ void psi_call_frame_do_callback(struct psi_call_frame *frame, struct psi_call_fr
 	rc = zend_fcall_info_call(&frame_arg->ival_ptr->zend.cb->fci,
 			&frame_arg->ival_ptr->zend.cb->fcc,	&return_value, NULL);
 	assert(rc == SUCCESS);
+	(void) rc;
 
 	/* marshal return value of the userland call */
 	frame_arg->zval_ptr = &return_value;