diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2015-12-08 23:07:24 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2015-12-08 23:07:24 +0000 |
| commit | 2ae377404d6f8a45742f46750e71c90c040f82bf (patch) | |
| tree | 6cf7f61c1537b7d7196aaad576ba81ce0331a90f /lib/common/BoxPlatform.h | |
| parent | 1f40f0f2003553f0bba6953dcecf73a0d2054f1b (diff) | |
Remove non-standard BSD u_int* types.
MSVC doesn't like them, and they're not necessary now that we have stdint.h.
Remove some compatibility typedefs from BoxPlatform.h and emu.h which are not
needed any longer either.
Diffstat (limited to 'lib/common/BoxPlatform.h')
| -rw-r--r-- | lib/common/BoxPlatform.h | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/lib/common/BoxPlatform.h b/lib/common/BoxPlatform.h index 06f34d5c..35ad7a2c 100644 --- a/lib/common/BoxPlatform.h +++ b/lib/common/BoxPlatform.h @@ -108,56 +108,6 @@ #endif #endif -#if defined WIN32 && !defined __MINGW32__ - typedef __int8 int8_t; - typedef __int16 int16_t; - typedef __int32 int32_t; - typedef __int64 int64_t; - - typedef unsigned __int8 u_int8_t; - typedef unsigned __int16 u_int16_t; - typedef unsigned __int32 u_int32_t; - typedef unsigned __int64 u_int64_t; - - #define HAVE_U_INT8_T - #define HAVE_U_INT16_T - #define HAVE_U_INT32_T - #define HAVE_U_INT64_T -#endif // WIN32 && !__MINGW32__ - -// Define missing types -#ifndef HAVE_UINT8_T - typedef u_int8_t uint8_t; -#endif - -#ifndef HAVE_UINT16_T - typedef u_int16_t uint16_t; -#endif - -#ifndef HAVE_UINT32_T - typedef u_int32_t uint32_t; -#endif - -#ifndef HAVE_UINT64_T - typedef u_int64_t uint64_t; -#endif - -#ifndef HAVE_U_INT8_T - typedef uint8_t u_int8_t; -#endif - -#ifndef HAVE_U_INT16_T - typedef uint16_t u_int16_t; -#endif - -#ifndef HAVE_U_INT32_T - typedef uint32_t u_int32_t; -#endif - -#ifndef HAVE_U_INT64_T - typedef uint64_t u_int64_t; -#endif - #if !HAVE_DECL_INFTIM #define INFTIM -1 #endif @@ -176,7 +126,7 @@ #endif #ifdef WIN32 - typedef u_int64_t InodeRefType; + typedef uint64_t InodeRefType; #else typedef ino_t InodeRefType; #endif |