X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Ftypes.h;h=4c85311e2a9c62bebe8e24b48de3edbf91215689;hb=43f92ce30b2398d1823e34e39ff248de521d015c;hp=84b55be31f0a1030dda7a44f89c00e6233d1960c;hpb=0ecb0529b5fcacc1abafa1f3f02a40c44783ada8;p=wimlib diff --git a/include/wimlib/types.h b/include/wimlib/types.h index 84b55be3..4c85311e 100644 --- a/include/wimlib/types.h +++ b/include/wimlib/types.h @@ -1,13 +1,13 @@ #ifndef _WIMLIB_TYPES_H #define _WIMLIB_TYPES_H -#include "wimlib_tchar.h" -#include "wimlib/compiler.h" - #include #include #include +#include "wimlib_tchar.h" +#include "wimlib/compiler.h" + #ifndef _NTFS_TYPES_H /* Unsigned integer types of exact size in bits */ typedef uint8_t u8; @@ -26,17 +26,10 @@ typedef uint16_t _bitwise_attr le16; typedef uint32_t _bitwise_attr le32; typedef uint64_t _bitwise_attr le64; -/* Signed little endian types of exact size (declare as unsigned to avoid sign - * extension on big-endian architectures) */ -typedef uint16_t _bitwise_attr sle16; -typedef uint32_t _bitwise_attr sle32; -typedef uint64_t _bitwise_attr sle64; - /* Unsigned big endian types of exact size */ typedef uint16_t _bitwise_attr be16; typedef uint32_t _bitwise_attr be32; typedef uint64_t _bitwise_attr be64; - #endif /* A pointer to 'utf16lechar' indicates a UTF-16LE encoded string */ @@ -54,6 +47,7 @@ typedef struct WIMStruct WIMStruct; */ typedef size_t machine_word_t; -#define WORDSIZE sizeof(machine_word_t) +#define WORDBYTES sizeof(machine_word_t) +#define WORDBITS (8 * WORDBYTES) #endif /* _WIMLIB_TYPES_H */