fix asmjit to at least give me _something_ to disable its typedefs of int32_t etc so that we can avoid them redundantly declaring themselves in builds that include EXPERIMENTAL_WIFI_COMM. asmjit is a bit too smart for its own good.
This commit is contained in:
parent
fe6b99a7a0
commit
b2a81e3ea5
|
@ -179,24 +179,60 @@ namespace AsmJit {
|
||||||
// Use typedefs.
|
// Use typedefs.
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
#if (_MSC_VER < 1300)
|
#if (_MSC_VER < 1300)
|
||||||
typedef char int8_t;
|
|
||||||
typedef short int16_t;
|
#ifndef HAVE_INT8_T
|
||||||
typedef int int32_t;
|
typedef char int8_t;
|
||||||
typedef unsigned char uint8_t;
|
|
||||||
typedef unsigned short uint16_t;
|
|
||||||
typedef unsigned int uint32_t;
|
|
||||||
typedef __int64 int64_t;
|
|
||||||
typedef unsigned __int64 uint64_t;
|
|
||||||
#else
|
|
||||||
typedef __int8 int8_t;
|
|
||||||
typedef __int16 int16_t;
|
|
||||||
typedef __int32 int32_t;
|
|
||||||
typedef __int64 int64_t;
|
|
||||||
typedef unsigned __int8 uint8_t;
|
|
||||||
typedef unsigned __int16 uint16_t;
|
|
||||||
typedef unsigned __int32 uint32_t;
|
|
||||||
typedef unsigned __int64 uint64_t;
|
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef HAVE_INT16_T
|
||||||
|
typedef short int16_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_INT32_T
|
||||||
|
typedef int int32_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_UINT8_T
|
||||||
|
typedef unsigned char uint8_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_UINT16_T
|
||||||
|
typedef unsigned short uint16_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_UINT32_T
|
||||||
|
typedef unsigned int uint32_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_INT64_T
|
||||||
|
typedef __int64 int64_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_UINT64_T
|
||||||
|
typedef unsigned __int64 uint64_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#ifndef HAVE_INT8_T
|
||||||
|
typedef __int8 int8_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_INT16_T
|
||||||
|
typedef __int16 int16_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_INT32_T
|
||||||
|
typedef __int32 int32_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_INT64_T
|
||||||
|
typedef __int64 int64_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_UINT8_T
|
||||||
|
typedef unsigned __int8 uint8_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_UINT16_T
|
||||||
|
typedef unsigned __int16 uint16_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_UINT32_T
|
||||||
|
typedef unsigned __int32 uint32_t;
|
||||||
|
#endif
|
||||||
|
#ifndef HAVE_UINT64_T
|
||||||
|
typedef unsigned __int64 uint64_t;
|
||||||
|
#endif //HAVE_U_INT64_T
|
||||||
|
|
||||||
|
#endif // _MSC_VER
|
||||||
#endif // _MSC_VER
|
#endif // _MSC_VER
|
||||||
#endif // STDINT.H
|
#endif // STDINT.H
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue