diff options
authorChris Wilson <>2007-03-10 17:50:33 +0000
committerChris Wilson <>2007-03-10 17:50:33 +0000
commit28195d8d1da7a34fbff4c9d217f6333c5472ed7c (patch)
parent3b161e80a045f1ebb11e196b7f514b96c302b746 (diff)
First attempt to achieve a more logical order in this chaos:
reordered all typedefs to be clearer and more readable (refs #3, merges [766])
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/win32/emu.h b/lib/win32/emu.h
index 0612e441..206e1f70 100644
--- a/lib/win32/emu.h
+++ b/lib/win32/emu.h
@@ -6,27 +6,24 @@
// basic types, may be required by other headers since we
// don't include sys/types.h
-#ifdef __MINGW32__
- #include <stdint.h>
- typedef uint32_t u_int32_t;
-#else // MSVC
- typedef __int64 int64_t;
- typedef __int32 int32_t;
- typedef __int16 int16_t;
- typedef __int8 int8_t;
+#ifndef __MINGW32__
typedef unsigned __int64 u_int64_t;
- typedef unsigned __int32 u_int32_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;
// emulated types, present on MinGW but not MSVC or vice versa
-#ifdef _MSC_VER
+#ifdef __MINGW32__
+ typedef uint32_t u_int32_t;
typedef unsigned int mode_t;
typedef unsigned int pid_t;