diff options
Diffstat (limited to 'src/mcpp-predefined.c')
| -rw-r--r-- | src/mcpp-predefined.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mcpp-predefined.c b/src/mcpp-predefined.c index 556232c..32b1ec4 100644 --- a/src/mcpp-predefined.c +++ b/src/mcpp-predefined.c @@ -553,7 +553,7 @@ mcpu_predefined_install( mcpu_macro_table *table ) return( -1 ); #endif - if( define_unsigned(table, "__MCPU_MACHINE_REGISTER_WIDTH__", + if( define_unsigned(table, "__MCPU_HOST_MACHINE_REGISTER_WIDTH__", MCPU_CPP_MPU_REGISTER_WIDTH) != 0 || define_unsigned(table, "__MCPU_REAL_IO_LIMIT__", MCPU_CPP_MPU_REAL_IO_LIMIT) != 0 || @@ -567,8 +567,8 @@ mcpu_predefined_install( mcpu_macro_table *table ) MCPU_CPP_MPU_REAL_IO_LIMIT) != 0 || define_unsigned(table, "__SIZEOF_POINTER__", 8) != 0 || define_unsigned(table, "__MCPU_POINTER_WIDTH__", 64) != 0 || - define_unsigned(table, "__MCPU_SIZEOF_SIZE__", MCPU_CPP_SIZEOF_SIZE_T) != 0 || - define_unsigned(table, "__MCPU_SIZE_WIDTH__", MCPU_CPP_SIZE_WIDTH) != 0 || + define_unsigned(table, "__MCPU_HOST_MACHINE_SIZEOF_SIZE__", MCPU_CPP_SIZEOF_SIZE_T) != 0 || + define_unsigned(table, "__MCPU_HOST_MACHINE_SIZE_WIDTH__", MCPU_CPP_SIZE_WIDTH) != 0 || define_unsigned(table, "__SIZEOF_PTRDIFF__", 8) != 0 || define_unsigned(table, "__PTRDIFF_WIDTH__", 64) != 0 || define_utf8(table, "__CHAR8_TYPE__", "char8") != 0 || @@ -588,21 +588,21 @@ mcpu_predefined_install( mcpu_macro_table *table ) } snprintf( type, sizeof(type), "uint%u", (unsigned)MCPU_CPP_SIZE_WIDTH ); - if( define_utf8(table, "__MCPU_SIZE_TYPE__", type) != 0 ) + if( define_utf8(table, "__MCPU_HOST_MACHINE_SIZE_TYPE__", type) != 0 ) return( -1 ); snprintf( ref, sizeof(ref), "__UINT%u_MAX__", (unsigned)MCPU_CPP_SIZE_WIDTH ); - if( define_from_macro(table, "__MCPU_SIZE_MAX__", ref) != 0 ) + if( define_from_macro(table, "__MCPU_HOST_MACHINE_SIZE_MAX__", ref) != 0 ) return( -1 ); snprintf( type, sizeof(type), "int%u", (unsigned)MCPU_CPP_SSIZE_WIDTH ); - if( define_utf8(table, "__MCPU_SSIZE_TYPE__", type) != 0 || - define_unsigned(table, "__MCPU_SSIZE_WIDTH__", MCPU_CPP_SSIZE_WIDTH) != 0 || - define_unsigned(table, "__MCPU_SIZEOF_SSIZE__", MCPU_CPP_SIZEOF_SSIZE_T) != 0 ) + if( define_utf8(table, "__MCPU_HOST_MACHINE_SSIZE_TYPE__", type) != 0 || + define_unsigned(table, "__MCPU_HOST_MACHINE_SSIZE_WIDTH__", MCPU_CPP_SSIZE_WIDTH) != 0 || + define_unsigned(table, "__MCPU_HOST_MACHINE_SIZEOF_SSIZE__", MCPU_CPP_SIZEOF_SSIZE_T) != 0 ) return( -1 ); if( MCPU_CPP_SSIZE_WIDTH <= 256 ) { snprintf( ref, sizeof(ref), "__INT%u_MAX__", (unsigned)MCPU_CPP_SSIZE_WIDTH ); - if( define_from_macro(table, "__MCPU_SSIZE_MAX__", ref) != 0 ) + if( define_from_macro(table, "__MCPU_HOST_MACHINE_SSIZE_MAX__", ref) != 0 ) return( -1 ); } |