X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi%2Fpsi_type.m4;h=b3940a4617e45a3915fe0e7767e426c3a8b7a48a;hp=28aa5808a4d5596f15bcb0515e1c5bf5de66129d;hb=42f44eb5bf4ecd36e26e051fada79d861d0f92d2;hpb=6d8fda8d1cd382e6d6626df5353d285176bd9bf2

diff --git a/m4/psi/psi_type.m4 b/m4/psi/psi_type.m4
index 28aa580..b3940a4 100644
--- a/m4/psi/psi_type.m4
+++ b/m4/psi/psi_type.m4
@@ -52,7 +52,7 @@ AC_DEFUN(PSI_TYPE, [
 	psi_basic_type=AS_TR_SH($2)
 	case $psi_basic_type in
 	int)
-		AX_CHECK_SIGN($1, :, [psi_basic_type=uint], [PSI_INCLUDES])
+		AX_CHECK_SIGN($1, :, [psi_basic_type=uint], PSI_INCLUDES)
 		;;
 	sint)
 		psi_basic_type=int
@@ -74,7 +74,7 @@ AC_DEFUN(PSI_STDTYPE, [
 		[double],[psi_add_stdtype "{PSI_T_DOUBLE, \"double\", NULL}"],
 		[long double],[psi_add_stdtype "{PSI_T_LONG_DOUBLE, \"long double\", NULL}"],
 		[
-			AX_CHECK_SIGN($1, psi_basic_type=int, psi_basic_type=uint, [PSI_INCLUDES])
+			AX_CHECK_SIGN($1, psi_basic_type=int, psi_basic_type=uint, PSI_INCLUDES)
 			AS_TR_SH(psi_basic_type_$1)=$psi_basic_type
 			psi_add_stdtype "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
 		])
@@ -113,7 +113,7 @@ AC_DEFUN(PSI_OPAQUE_TYPE, [
 		])
 		case "$AS_TR_SH([psi_cv_type_class_]$1)" in
 		scalar)
-			AX_CHECK_SIGN($1, [psi_basic_type=int], [psi_basic_type=uint], [PSI_INCLUDES])
+			AX_CHECK_SIGN($1, [psi_basic_type=int], [psi_basic_type=uint], PSI_INCLUDES)
 			psi_add_type "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
 			;;
 		struct)
@@ -232,7 +232,7 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
 	AC_CHECK_ALIGNOF(long double)
 
 	PSI_STDTYPE(bool)
-	AC_CHECK_ALIGNOF(bool, [PSI_INCLUDES])
+	AC_CHECK_ALIGNOF(bool, PSI_INCLUDES)
 
 	PSI_STDTYPE(char, int)
 	AC_CHECK_ALIGNOF(char)
@@ -243,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)
@@ -255,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)
 ])