Merge branch 'master' into vulkan
This commit is contained in:
commit
08c50af7b8
|
@ -85,14 +85,12 @@
|
||||||
#endif // XE_PLATFORM_MAC
|
#endif // XE_PLATFORM_MAC
|
||||||
|
|
||||||
#if XE_COMPILER_MSVC
|
#if XE_COMPILER_MSVC
|
||||||
#define XEPACKEDSTRUCT(name, value) \
|
#define XEPACKEDSTRUCT(name, value) \
|
||||||
__pragma(pack(push, 1)) struct name##_s value __pragma(pack(pop)); \
|
__pragma(pack(push, 1)) struct name value __pragma(pack(pop));
|
||||||
typedef struct name##_s name;
|
|
||||||
#define XEPACKEDSTRUCTANONYMOUS(value) \
|
#define XEPACKEDSTRUCTANONYMOUS(value) \
|
||||||
__pragma(pack(push, 1)) struct value __pragma(pack(pop));
|
__pragma(pack(push, 1)) struct value __pragma(pack(pop));
|
||||||
#define XEPACKEDUNION(name, value) \
|
#define XEPACKEDUNION(name, value) \
|
||||||
__pragma(pack(push, 1)) union name##_s value __pragma(pack(pop)); \
|
__pragma(pack(push, 1)) union name value __pragma(pack(pop));
|
||||||
typedef union name##_s name;
|
|
||||||
#else
|
#else
|
||||||
#define XEPACKEDSTRUCT(name, value) struct __attribute__((packed)) name value;
|
#define XEPACKEDSTRUCT(name, value) struct __attribute__((packed)) name value;
|
||||||
#define XEPACKEDSTRUCTANONYMOUS(value) struct __attribute__((packed)) value;
|
#define XEPACKEDSTRUCTANONYMOUS(value) struct __attribute__((packed)) value;
|
||||||
|
|
Loading…
Reference in New Issue