options/internal: reorder and rename params of __MLIBC_FIELD_PADDED

managarm · Mar 4, 2024 · f0b6039 · f0b6039
1 parent 7a854fd
commit f0b6039
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/options/ansi/include/bits/ansi/timespec.h b/options/ansi/include/bits/ansi/timespec.h
@@ -12,7 +12,7 @@ struct timespec {
 	time_t tv_sec;
 	// tv_nspec is required to be long by the C standard.
 	// However linux kernel expects long long. So we add padding.
-	__MLIBC_FIELD_PADDED(long, tv_nsec, long long);
+	__MLIBC_FIELD_PADDED(long, long long, tv_nsec);
 };
 
 #endif // MLIBC_TIMESPEC_H

diff --git a/options/internal/include/bits/field-padding.h b/options/internal/include/bits/field-padding.h
@@ -1,10 +1,9 @@
 #ifndef MLIBC_FIELD_PADDING_H
 #define MLIBC_FIELD_PADDING_H
 
-
-#define __MLIBC_FIELD_PADDED(T, F, PT) \
-  PT : (sizeof(PT)-sizeof(T))*8*(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__); \
+#define __MLIBC_FIELD_PADDED(T, AT, F) \
+  AT : (sizeof(AT)-sizeof(T))*8*(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__); \
   T F; \
-  PT : (sizeof(PT)-sizeof(T))*8*(__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+  AT : (sizeof(AT)-sizeof(T))*8*(__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
 
 #endif