X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi.m4;h=c9f4e080df6c0381680e18e623e896d22501daea;hp=1f6af02f1930e960ba3661730d29d5a6023a3ebe;hb=7e4b0ccdd2123647b6fff8065c0abc61be3fb44d;hpb=89b5359ee32bc4c90e2e3259f9565d2705f36c6b

diff --git a/m4/psi.m4 b/m4/psi.m4
index 1f6af02..c9f4e08 100644
--- a/m4/psi.m4
+++ b/m4/psi.m4
@@ -1,5 +1,6 @@
 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_CONSTS=$PHP_PSI_SRCDIR/php_psi_consts.h
@@ -13,13 +14,25 @@ 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, [
-	cat >$PSI_TYPES <<EOF
+	cat >$PSI_STDTYPES <<EOF
 /* generated by configure */
 static struct psi_predef_type {
 	token_t type_tag;
 	const char *type_name;
 	const char *alias;
-} psi_predef_types@<:@@:>@ = {
+} 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
+/* generated by configure */
+static struct psi_predef_type psi_predef_types@<:@@:>@ = {
 EOF
 	cat >$PSI_STRUCTS <<EOF
 /* generated by configure */
@@ -74,7 +87,7 @@ AC_DEFUN(PSI_CONFIG_DONE, [
 /* generated by configure */
 PSI_INCLUDES
 EOF
-	for i in $PSI_TYPES $PSI_STRUCTS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS; do
+	for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS; do
 		cat >>$i <<EOF
 	{0}
 };