X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi%2Fpsi.m4;h=9c2c6d2790d8900a89ceb97210e0f10ab889181c;hp=dbe3defc8f4d89acb3139b18d98c9e8c899b026b;hb=fb8f7887c289ae74d6e8dd85d55ae09e6796e890;hpb=dbf1c3d1754adc5ee571e71395dbd297a9c3d093

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index dbe3def..9c2c6d2 100644
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -1,276 +1,195 @@
-dnl Generated headers with pre-defined types, structs, consts and decls.
-PSI_STDINC=$PHP_PSI_SRCDIR/php_psi_stdinc.h
-PSI_STDTYPES=$PHP_PSI_SRCDIR/php_psi_stdtypes.h
-PSI_TYPES=$PHP_PSI_SRCDIR/php_psi_types.h
-PSI_STRUCTS=$PHP_PSI_SRCDIR/php_psi_structs.h
-PSI_UNIONS=$PHP_PSI_SRCDIR/php_psi_unions.h
-PSI_CONSTS=$PHP_PSI_SRCDIR/php_psi_consts.h
-PSI_REDIRS=$PHP_PSI_SRCDIR/php_psi_redirs.h
-PSI_MACROS=$PHP_PSI_SRCDIR/php_psi_macros.h
-PSI_DECLS=$PHP_PSI_SRCDIR/php_psi_decls.h
-PSI_VA_DECLS=$PHP_PSI_SRCDIR/php_psi_va_decls.h
-PSI_FN_DECLS=$PHP_PSI_SRCDIR/php_psi_fn_decls.h
-
-PSI_CONFIG_APPEND=
-
 dnl PSI_CONFIG_INIT()
 dnl Creates stubs of the headers with pre-defined types etc.
-dnl These headers are included by src/context.c.
-dnl This macro must be called prior any checks for a type, struct, decl etc.
 AC_DEFUN(PSI_CONFIG_INIT, [
-	for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_MACROS $PSI_DECLS $PSI_VA_DECLS $PSI_FN_DECLS; do
-		cat >$i <<EOF
-/* generated by configure */
-#include "php_psi_stdinc.h"
-EOF
-	done
-	cat >>$PSI_STDTYPES <<EOF
-static struct psi_std_type {
-	token_t type_tag;
-	const char *type_name;
-	const char *alias;
-} psi_std_types@<:@@:>@ = {
-	{PSI_T_INT8, "int8_t", NULL},
-	{PSI_T_INT16, "int16_t", NULL},
-	{PSI_T_INT32, "int32_t", NULL},
-	{PSI_T_INT64, "int64_t", NULL},
-	{PSI_T_UINT8, "uint8_t", NULL},
-	{PSI_T_UINT16, "uint16_t", NULL},
-	{PSI_T_UINT32, "uint32_t", NULL},
-	{PSI_T_UINT64, "uint64_t", NULL},
-EOF
-	cat >>$PSI_TYPES <<EOF
-static struct psi_predef_type {
-	token_t type_tag;
-	const char *type_name;
-	const char *alias;
-} psi_predef_types@<:@@:>@ = {
-EOF
-	cat >>$PSI_STRUCTS <<EOF
-static struct psi_predef_struct {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t offset;
-	size_t size;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_structs@<:@@:>@ = {
-EOF
-	cat >>$PSI_UNIONS <<EOF
-static struct psi_predef_union {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t offset;
-	size_t size;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_unions@<:@@:>@ = {
-EOF
-	cat >>$PSI_CONSTS <<EOF
-static struct psi_predef_const {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	const char *val_text;
-	token_t val_type_tag;
-} psi_predef_consts@<:@@:>@ = {
-EOF
-	cat >>$PSI_REDIRS <<EOF
-typedef void (*psi_func_ptr)();
-static struct psi_func_redir {
-	const char *name;
-	psi_func_ptr func;
-} psi_func_redirs@<:@@:>@ = {
-EOF
-	cat >>$PSI_MACROS <<EOF
-EOF
-	cat >>$PSI_DECLS <<EOF
-static struct psi_predef_decl {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_decls@<:@@:>@ = {
-EOF
-	cat >>$PSI_VA_DECLS <<EOF
-static struct psi_predef_decl psi_predef_vararg_decls@<:@@:>@ = {
-EOF
-	cat >>$PSI_FN_DECLS <<EOF
-static struct psi_predef_decl psi_predef_functor_decls@<:@@:>@ = {
-EOF
+	psi_save_LIBS=$LIBS
+	LIBS=
+
+	AC_MSG_CHECKING([psi source dir])
+	PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
+	AC_MSG_RESULT([$PHP_PSI_SRCDIR])
+	
+	AC_MSG_CHECKING([psi build dir])
+	case "PHP_EXT_BUILDDIR(psi)" in
+	""|.) PHP_PSI_BUILDDIR=$PHP_PSI_SRCDIR
+		;;
+	*)    PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
+		;;
+	esac
+	AC_MSG_RESULT([$PHP_PSI_BUILDDIR])
+	
+	PSI_STDTYPES=
+	PSI_CONSTS=
+	
+	AC_CONFIG_FILES([$PHP_PSI_BUILDDIR/php_psi_predef.h:$PHP_PSI_SRCDIR/php_psi_predef.h.in])
+
 ])
 
 dnl PSI_CONFIG_DONE()
 dnl Finish the headers with the pre-defined types etc.
 AC_DEFUN(PSI_CONFIG_DONE, [
-	cat >$PSI_STDINC <<EOF
-/* generated by configure */
-#ifndef _PSI_STDINC
-# define _PSI_STDINC
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE
-#endif
-PSI_INCLUDES
-#endif
-EOF
-	for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS $PSI_FN_DECLS; do
-		cat >>$i <<EOF
-	{0}
-};
-EOF
-	done
+	psi_eval_LIBS=$LIBS
+	LIBS=$psi_save_LIBS
+	PHP_EVAL_LIBLINE($psi_eval_LIBS, PSI_SHARED_LIBADD)
+	
+	AC_SUBST([PSI_STDTYPES])
+	AC_SUBST([PSI_CPP_SEARCH])
+	AC_SUBST([PSI_CPP_PREDEF])
+	
+	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR)
+	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
+	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/calc)
+	PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/types)
+	PHP_ADD_INCLUDE($PHP_PSI_BUILDDIR)
+	PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
+	PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src/types)
+
+	PHP_PSI_HEADERS=" \
+		calc/basic.h calc/bin.h calc/bool.h calc/cast.h \
+		calc/unary.h calc/cmp.h calc/oper.h \
+		`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)` \
+	"
+	# parser_* should come first
+	PHP_PSI_SOURCES=" \
+		src/parser_proc.c src/parser_scan.c \
+		`(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c \
+			| $EGREP -v '^src/parser_' \
+		)` \
+	"
+	PHP_PSI_GENERATED=" \
+		src/parser_proc.c src/parser_scan.c \
+		src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
+		src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
+	"
+
+	PHP_SUBST(PHP_PSI_GENERATED)
+	PHP_SUBST(PHP_PSI_HEADERS)
+	PHP_SUBST(PHP_PSI_SOURCES)
+
+	PHP_SUBST(PHP_PSI_SRCDIR)
+	PHP_SUBST(PHP_PSI_BUILDDIR)
+])
+
+dnl PSI_CHECK_GNU_SOURCE
+dnl Check whether _GNU_SOURCE is already defined.
+AC_DEFUN([PSI_CHECK_GNU_SOURCE], [
+	AC_MSG_CHECKING([for _GNU_SOURCE])
+	AC_EGREP_CPP([gnu_source_not_defined], [
+		#ifndef _GNU_SOURCE
+		gnu_source_not_defined
+		#endif
+	], [
+		AC_MSG_RESULT([needs define])
+		AC_DEFINE([_GNU_SOURCE], [1], [ ])
+	], [
+		AC_MSG_RESULT([already defined])
+	])
 ])
 
-dnl PSI_SH_CONFIG_POSIX_ENABLED(section)
-dnl Expand to $psi_config_posix_<section>
-AC_DEFUN(PSI_SH_CONFIG_POSIX_ENABLED, [$AS_TR_SH([psi_config_posix_]$1)])
+dnl PSI_CHECK_CPP
+dnl Queries the preprocessor about predefined macros and include search paths
+AC_DEFUN([PSI_CHECK_CPP], [
+	AC_PROG_AWK
 
-dnl PSI_CONFIG_POSIX_ENABLED(section, action-if-yes, action-if-not)
-dnl Internal. Used to check if --enable-psi-posix=section was given.
-AC_DEFUN(PSI_CONFIG_POSIX_ENABLED, [
-	AS_TR_SH([psi_config_posix_]$1)=false
-	case "$PHP_PSI_POSIX" in
-	yes|all)
-		AS_TR_SH([psi_config_posix_]$1)=true
-		;;
-	*)
-		if expr "$PHP_PSI_POSIX" : '\b$1\b' >/dev/null; then
-			AS_TR_SH([psi_config_posix_]$1)=true
-		fi
-		;;
-	esac
-	if $AS_TR_SH([psi_config_posix_]$1); then
-		ifelse([$2],,:,[$2])
-	else
-		ifelse([$3],,:,[$3])
-	fi
+	AC_MSG_CHECKING(for preprocessor defaults)
+	psi_cpp_predef=`$CPP -Wp,-dM $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -U__BLOCKS__ - </dev/null`
+	psi_cpp_search=`$CPP -Wp,-v $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - </dev/null 2>&1 >/dev/null \
+		| $AWK '
+			/include.*search.*start/ { 
+				capture = 1
+				next
+			}
+			/@<:@Ee@:>@nd.*search/ {
+				capture = 0
+			}
+			{ 
+				if (capture)
+					print $1
+			}
+		' \
+	`
+	psi_cpp_predef_count=`printf %s "$psi_cpp_predef" | wc -l`
+	psi_cpp_search_count=`printf %s "$psi_cpp_search" | wc -l`
+	
+	AC_MSG_RESULT([$psi_cpp_predef_count predefined macros, and $psi_cpp_search_count search paths])
+	
+	PSI_CPP_PREDEF=`printf "%s\n" "$psi_cpp_predef" | \
+		$AWK '{
+			gsub(/"/, "\\\\\"");
+			printf "\"%s\\\n\"\n", $[]0
+		}' \
+	`
+	PSI_CPP_SEARCH=`printf %s "$psi_cpp_search" | \
+		$AWK '
+			{
+				if (i) printf "\":\" ";
+				else   printf "    ";
+				gsub(/^@<:@@<:@:space:@:>@@:>@+/,"");
+				gsub(/@<:@@<:@:space:@:>@@:>@+$/,"");
+				printf "\"%s\"\n", $[]0;
+				++i
+			}' \
+	`
 ])
 
-dnl PSI_TEST_POSIX_ENABLED(section, action-if-yes, action-if-not)
-dnl Shell-if test if PSI POSIX section was configured.
-AC_DEFUN(PSI_SH_TEST_POSIX_ENABLED, [
-	if test "PSI_SH_CONFIG_POSIX_ENABLED([$1])" && $PSI_SH_CONFIG_POSIX_ENABLED([$1]); then
-		ifelse([$2],,:,[$2])
+dnl PSI_CHECK_MAINTAINER_MODE
+dnl Check for --enable-psi-maintainer-mode
+dnl Enables Makefile dependencies and extra compile warnings
+AC_DEFUN([PSI_CHECK_MAINTAINER_MODE], [
+	if test "$PHP_PSI_MAINTAINER_MODE" = "yes"; then
+		PSI_DEPS=true
+		PHP_SUBST(PSI_DEPS)
+		CFLAGS="$CFLAGS -Wall -Wextra"
+		m4_foreach(flag, [
+			[fstack-protector],
+			[Wduplicate-decl-specifier],
+			[Wnull-dereference],
+			[Winit-self],
+			[Wimplicit-fallthrough=1],
+			[Wshift-overflow],
+			[Wuninitialized],
+			[Walloc-zero],
+			[Wduplicated-branches],
+			[Wduplicated-cond],
+			[Wtrampolines],
+			[Wpointer-arith],
+			[Wcast-align],
+			[Wmissing-prototypes],
+			[Wmissing-declarations],
+			[Wredundant-decls],
+			[Wdisabled-optimization],
+			[Wno-sign-compare],
+			[Wno-unused-parameter],
+			[Wno-cast-function-type]], 
+		[
+			AX_CHECK_COMPILE_FLAG([-][flag], [CFLAGS="$CFLAGS -"]flag)
+		])
 	else
-		ifelse([$3],,:,[$3])
+		PSI_DEPS=false
 	fi
 ])
 
-dnl PSI_CONFIG_POSIX(section, headers)
-AC_DEFUN(PSI_CONFIG_POSIX, [
-	PSI_CONFIG_POSIX_ENABLED($1, [
-		PHP_CONFIGURE_PART(Configuring PSI POSIX: $1)
-		ifelse([$2],,:,[AC_CHECK_HEADERS($2)])
-	], [
-		return 0
-	])
+dnl PSI_CHECK_THREADED_PARSER
+dnl Check for --enable-psi-threaded-parser
+dnl Enables threaded parser if HAVE_PTHREAD && HAVE_ASPRINTF
+AC_DEFUN([PSI_CHECK_THREADED_PARSER], [
+	if test "$PHP_PSI_THREADED_PARSER" = "yes"; then
+		AC_DEFINE([PSI_THREADED_PARSER], [HAVE_PTHREAD && HAVE_ASPRINTF],
+			[whether to enable the threaded parser])
+	fi
 ])
 
 AC_DEFUN(PSI_PTHREAD_ONCE, [
 	AX_PTHREAD([
 		LIBS="$PTHREAD_LIBS $LIBS"
 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+		AC_DEFINE([HAVE_PTHREAD],[1],
+			[Define if you have POSIX threads libraries and header files.])
 	])
 ])
-AC_DEFUN(PSI_PTHREAD, [
+AC_DEFUN(PSI_CHECK_PTHREAD, [
 	AC_REQUIRE([PSI_PTHREAD_ONCE])
 ])
 
-dnl PSI_INCLUDES()
-dnl Expands to a complete list of include statements including
-dnl AC_INCLUDES_DEFAULT().
-AC_DEFUN(PSI_INCLUDES, [#define PSI_INCLUDES
-#define _GNU_SOURCE 1
-#define _POSIX_C_SOURCE 200809L
-#define _XOPEN_SOURCE 700
-AC_INCLUDES_DEFAULT()
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-#ifdef HAVE_GLOB_H
-# include <glob.h>
-#endif
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#ifdef HAVE_XLOCALE_H
-# include <xlocale.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-# include <netinet/tcp.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifdef HAVE_NDBM_H
-# include <ndbm.h>
-#elif HAVE_GDBM_NDBM_H
-# include <gdbm-ndbm.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#ifdef HAVE_POLL_H
-# include <poll.h>
-#endif
-#ifdef HAVE_RESOLV_H
-# include <resolv.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
-# include <sys/uio.h>
-#endif
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
-#ifdef HAVE_TIME_H
-# include <time.h>
-#endif
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-#ifdef HAVE_SYSLOG_H
-# include <syslog.h>
-#endif
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-#ifdef HAVE_WCTYPE_H
-# include <wctype.h>
-#endif
-])
-
-dnl PSI_LEMON()
-dnl Declare $LEMON precious, and check for a `lemon` in $PATH.
-AC_DEFUN(PSI_LEMON, [
-	AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
-	AC_PATH_PROG(LEMON, lemon, ./lemon)
-	PHP_SUBST(LEMON)
-])
-
 dnl PSI_PKG_CONFIG()
 dnl Check for `pkg-config` and add possible libjit and libffi directories to
 dnl $PKG_CONFIG_PATH, because those libs often ship with headers etc. in
@@ -287,75 +206,14 @@ dnl PSI_SH_SIZEOF(type)
 dnl expand to shell variable $ac_cv_sizeof_<TYPE>
 AC_DEFUN([PSI_SH_SIZEOF], [$AS_TR_SH([ac_cv_sizeof_]$1)])
 
-dnl PSI_SH_OFFSETOF(type)
-dnl Expand to shell variable $ac_cv_offsetof_<TYPE>
-AC_DEFUN([PSI_SH_OFFSETOF], [$AS_TR_SH([ac_cv_offsetof_]$1)])
-
-dnl PSI_SH_ALIGNOF(type)
-dnl Expand to shell variable $ac_cv_offsetof_<TYPE>
-AC_DEFUN([PSI_SH_ALIGNOF], [$AS_TR_SH([ac_cv_alignof_]$1)])
-
 dnl PSI_SH_TEST_SIZEOF(type)
 dnl `if` condition to test if $ac_cv_sizeof_$1 is greater than 0.
 AC_DEFUN([PSI_SH_TEST_SIZEOF], [test -n "$AS_TR_SH([ac_cv_sizeof_]$1)" && test "$AS_TR_SH([ac_cv_sizeof_]$1)" -gt 0])
 
-dnl PSI_SH_TEST_ALIGNOF(type)
-dnl `if` condition to test if $ac_cv_alignof_$1 is greater than 0.
-AC_DEFUN([PSI_SH_TEST_ALIGNOF], [test -n "$AS_TR_SH([ac_cv_alignof_]$1)" && test "$AS_TR_SH([ac_cv_alignof_]$1)" -gt 0])
-
 dnl PSI_CHECK_SIZEOF(type, special-includes)
-dnl AC_CHECK_SIZEOF wrapper with PSI_INCLUDES
-dnl Defines psi\\SIZEOF_<TYPE> pre-defined constant in $PSI_CONSTS.
 AC_DEFUN(PSI_CHECK_SIZEOF, [
-	AC_CHECK_SIZEOF($1, [], PSI_INCLUDES
+	AC_CHECK_SIZEOF($1, [],
 		$2)
-	if PSI_SH_TEST_SIZEOF($1); then
-		psi_add_int_const "AS_TR_CPP([SIZEOF_]$1)" "$AS_TR_SH([ac_cv_sizeof_]$1)"
-	fi
-])
-
-dnl PSI_CHECK_ALIGNOF(type, special-includes)
-dnl AC_CHECK_ALIGNOF wrapper with PSI_INCLUDES
-dnl Defines psi\\ALIGNOF_<TYPE> pre-defined constant in $PSI_CONSTS.
-AC_DEFUN(PSI_CHECK_ALIGNOF, [
-	AC_CHECK_ALIGNOF($1, PSI_INCLUDES
-		$2)
-	if PSI_SH_TEST_ALIGNOF($1); then
-		psi_add_int_const "AS_TR_CPP([ALIGNOF_]$1)" "$AS_TR_SH([ac_cv_alignof_]$1)"
-	fi
-])
-
-dnl PSI_CHECK_OFFSETOF(struct, element)
-dnl Check the offset of a struct element, implemented in the similar manner
-dnl like AC_CHECK_SIZEOF.
-dnl AC_DEFINEs OFFSETOF_<STRUCT>_<ELEMENT>.
-AC_DEFUN(PSI_CHECK_OFFSETOF, [
-	_AC_CACHE_CHECK_INT(
-		[offset of $2 in $1],
-		[AS_TR_SH([ac_cv_offsetof_$1_$2])],
-		[(long int) (offsetof ($1, $2))],
-		[PSI_INCLUDES],
-		[AC_MSG_FAILURE([cannot compute offsetof ($1, $2)])]
-	)
-	AC_DEFINE_UNQUOTED(
-		AS_TR_CPP(offsetof_$1_$2),
-		$AS_TR_SH([ac_cv_offsetof_$1_$2]),
-		[The offset of `$2' in `$1', as computed by offsetof.]
-	)
-])
-
-
-dnl PSI_COMPUTE_STR(variable, string or expression)
-dnl Compute a string constant value in a similar manner like AC_COMPUTE_INT.
-AC_DEFUN(PSI_COMPUTE_STR, [
-	AC_TRY_RUN(
-		PSI_INCLUDES
-		[int main() {
-			return EOF == fputs($2, fopen("conftest.out", "w"));
-		}
-	], [
-		eval $1=\\\"`cat conftest.out`\\\"
-	])
 ])
 
 dnl PSI_CHECK_LIBJIT()
@@ -407,9 +265,10 @@ AC_DEFUN(PSI_CHECK_LIBFFI, [
 		AC_MSG_CHECKING(for libffi)
 		psi_cv_libffi_dir=`$PKG_CONFIG --variable=prefix libffi`
 		AC_MSG_RESULT($psi_cv_libffi_dir)
-		PHP_EVAL_INCLINE(`$PKG_CONFIG --cflags libffi`)
-		PHP_EVAL_LIBLINE(`$PKG_CONFIG --libs libffi`, PSI_SHARED_LIBADD)
+		PHP_EVAL_INCLINE([`$PKG_CONFIG --cflags libffi`])
+		PHP_EVAL_LIBLINE([`$PKG_CONFIG --libs libffi`], PSI_SHARED_LIBADD) dnl `
 		AC_DEFINE(HAVE_LIBFFI, 1, Have libffi)
+		AC_DEFINE_UNQUOTED([PHP_PSI_LIBFFI_VERSION], ["`$PKG_CONFIG --modversion libffi`"], [libffi version])
 	else
 		AC_CACHE_CHECK(for libffi, psi_cv_libffi_dir, [
 		for psi_cv_libffi_dir in $PHP_PSI_LIBFFI {/usr{,/local},/opt}{,/libffi}
@@ -429,6 +288,13 @@ AC_DEFUN(PSI_CHECK_LIBFFI, [
 			AC_MSG_WARN([Could not find libffi, please provide the base install path])
 		fi
 	fi
+	
+	save_CFLAGS=$CFLAGS
+	CFLAGS="$CFLAGS $INCLUDES"
+	AC_CHECK_DECL(FFI_STDCALL,[AC_DEFINE([HAVE_FFI_STDCALL],[1],[ ])],,[#include "ffi.h"])
+	AC_CHECK_DECL(FFI_FASTCALL,[AC_DEFINE([HAVE_FFI_FASTCALL],[1],[ ])],,[#include "ffi.h"])
+	CFLAGS=$save_CFLAGS
+	
 	PHP_CHECK_LIBRARY(ffi, ffi_closure_alloc, [
 		PHP_CHECK_LIBRARY(ffi, ffi_prep_closure_loc, [
 			AC_DEFINE(PSI_HAVE_FFI_PREP_CLOSURE_LOC, 1, [ ])