X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=3aa815b1ae5380701d07c8d3b94bdc9c2731cba2;hb=c080804a9ae61e4ba0ec6fc7288c81c326fa9ddb;hp=9d989ad5ce7f8456470ed8aaf394a063fc2a98b8;hpb=600d7b284d3eee7e6e564c1df249c73e185de043;p=cparser

diff --git a/main.c b/main.c
index 9d989ad..3aa815b 100644
--- a/main.c
+++ b/main.c
@@ -950,16 +950,19 @@ static void init_types_and_adjust(void)
 		set_typeprops_type(&props[ATOMIC_TYPE_LONGLONG], type_long_long);
 
 	ir_type *type_unsigned_long_long = be_params->type_unsigned_long_long;
-	if (type_long_long != NULL)
+	if (type_unsigned_long_long != NULL)
 		set_typeprops_type(&props[ATOMIC_TYPE_ULONGLONG], type_unsigned_long_long);
 
 	/* operating system ABI specifics */
 	const char *os = target_machine->operating_system;
 	if (is_darwin_os(os)) {
 		if (machine_size == 32) {
-			props[ATOMIC_TYPE_DOUBLE].struct_alignment = 4;
-			props[ATOMIC_TYPE_LONG_DOUBLE].size        = 16;
-			props[ATOMIC_TYPE_LONG_DOUBLE].alignment   = 16;
+			props[ATOMIC_TYPE_LONGLONG].struct_alignment    =  4;
+			props[ATOMIC_TYPE_ULONGLONG].struct_alignment   =  4;
+			props[ATOMIC_TYPE_DOUBLE].struct_alignment      =  4;
+			props[ATOMIC_TYPE_LONG_DOUBLE].size             = 16;
+			props[ATOMIC_TYPE_LONG_DOUBLE].alignment        = 16;
+			props[ATOMIC_TYPE_LONG_DOUBLE].struct_alignment = 16;
 		}
 	} else if (is_windows_os(os)) {
 		if (machine_size == 64) {