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/win32/emu.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/win32/emu.h')
| -rw-r--r-- | lib/win32/emu.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/lib/win32/emu.h b/lib/win32/emu.h index 5669c411..4b263e22 100644 --- a/lib/win32/emu.h +++ b/lib/win32/emu.h @@ -32,27 +32,11 @@ // basic types, may be required by other headers since we // don't include sys/types.h - -#ifdef __MINGW32__ - #include <stdint.h> -#else // MSVC - typedef unsigned __int64 u_int64_t; - typedef unsigned __int64 uint64_t; - typedef __int64 int64_t; - typedef unsigned __int32 uint32_t; - typedef unsigned __int32 u_int32_t; - typedef __int32 int32_t; - typedef unsigned __int16 uint16_t; - typedef __int16 int16_t; - typedef unsigned __int8 uint8_t; - typedef __int8 int8_t; -#endif +#include <stdint.h> // emulated types, present on MinGW but not MSVC or vice versa -#ifdef __MINGW32__ - typedef uint32_t u_int32_t; -#else +#ifndef __MINGW32__ typedef unsigned int mode_t; typedef unsigned int pid_t; #endif @@ -142,7 +126,7 @@ inline struct passwd * getpwnam(const char * name) #define S_ISDIR(x) (S_IFDIR & x) #endif -inline int chown(const char * Filename, u_int32_t uid, u_int32_t gid) +inline int chown(const char * Filename, uint32_t uid, uint32_t gid) { //important - this needs implementing //If a large restore is required then |