X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpsi%2Fpsi_type.m4;h=b3940a4617e45a3915fe0e7767e426c3a8b7a48a;hb=53495ef4bd0321f7f92dd05eef8e01b90d7b415a;hp=502c48ad0058c8f62a904146482082d7e765f5ec;hpb=894e0ce93f9ce82109e904ae35c249bf6abe54f1;p=m6w6%2Fext-psi

diff --git a/m4/psi/psi_type.m4 b/m4/psi/psi_type.m4
index 502c48a..b3940a4 100644
--- a/m4/psi/psi_type.m4
+++ b/m4/psi/psi_type.m4
@@ -135,12 +135,10 @@ AC_DEFUN(PSI_FUNCTOR_TYPE, [
 	dnl psi_add_type "{PSI_T_POINTER, \"void\", \"PSI_VAR_NAME($1)\"}"
 	AS_TR_SH([ac_cv_sizeof_]PSI_VAR_NAME($1))=PSI_SH_SIZEOF(void *)
 	PSI_DECL_TYPE([$1], [$2])
-	if test "$PHP_DEBUG" = "1"; then
-		AC_CHECK_TYPE(PSI_VAR_NAME($1), [], [
-			psi_add_macro ["#undef ]PSI_VAR_NAME($1)["]
-			psi_add_macro ["typedef ]PSI_VAR_TYPE($1)[ (*]PSI_VAR_NAME($1)[)]$2;"
-		])
-	fi
+	AC_CHECK_TYPE(PSI_VAR_NAME($1), [], [
+		psi_add_macro ["#undef ]PSI_VAR_NAME($1)["]
+		psi_add_macro ["typedef ]PSI_VAR_TYPE($1)[ (*]PSI_VAR_NAME($1)[)]$2;"
+	])
 ])
 
 dnl PSI_VAR_TYPE(decl arg)
@@ -245,8 +243,12 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
 	PSI_STDTYPE(short int, int)
 	PSI_STDTYPE(signed short, int)
 	PSI_STDTYPE(signed short int, int)
+	PSI_STDTYPE(short signed, int)
+	PSI_STDTYPE(short signed int, int)
 	PSI_STDTYPE(unsigned short, uint)
 	PSI_STDTYPE(unsigned short int, uint)
+	PSI_STDTYPE(short unsigned, uint)
+	PSI_STDTYPE(short unsigned int, uint)
 	PSI_STDTYPE(int, int)
 	AC_CHECK_ALIGNOF(int)
 	PSI_STDTYPE(signed int, int)
@@ -257,14 +259,25 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
 	AC_CHECK_ALIGNOF(long)
 	PSI_STDTYPE(long int, int)
 	PSI_STDTYPE(signed long int, int)
+	PSI_STDTYPE(long signed int, int)
 	PSI_STDTYPE(unsigned long, uint)
 	PSI_STDTYPE(unsigned long int, uint)
+	PSI_STDTYPE(long unsigned, uint)
+	PSI_STDTYPE(long unsigned int, uint)
 	PSI_STDTYPE(long long, int)
 	AC_CHECK_ALIGNOF(long long)
 	PSI_STDTYPE(signed long long, int)
 	PSI_STDTYPE(signed long long int, int)
+	PSI_STDTYPE(long signed long, int)
+	PSI_STDTYPE(long signed long int, int)
+	PSI_STDTYPE(long long signed, int)
+	PSI_STDTYPE(long long signed int, int)
 	PSI_STDTYPE(unsigned long long, uint)
 	PSI_STDTYPE(unsigned long long int, uint)
+	PSI_STDTYPE(long unsigned long, uint)
+	PSI_STDTYPE(long unsigned long int, uint)
+	PSI_STDTYPE(long long unsigned, uint)
+	PSI_STDTYPE(long long unsigned int, uint)
 	dnl this must come after the check for "unsigned long long int"; autoconf, wth?
 	PSI_STDTYPE(long long int, int)
 ])