Fix redundant typedef errors when compiling against CWPro6 MSL

This commit is contained in:
Brendan Shanks 2017-07-20 00:09:37 -07:00
parent ff4727df59
commit 4044a39ed4
1 changed files with 4 additions and 3 deletions

View File

@ -3,13 +3,16 @@
#ifndef _INTTYPES_H_ #ifndef _INTTYPES_H_
#define _INTTYPES_H_ #define _INTTYPES_H_
#ifdef __MWERKS__
/* CodeWarrior had this header since at least Pro 5, but I only noticed this now. */
#include <stdint.h>
#else
/* /*
* Regrettably, this is needed for *int64_t * Regrettably, this is needed for *int64_t
*/ */
#include <MacTypes.h> #include <MacTypes.h>
#include <ansi_parms.h> #include <ansi_parms.h>
#if __MSL__ < 0x7001
#if __MSL__ < 0x6000 #if __MSL__ < 0x6000
typedef char int8_t; typedef char int8_t;
#else #else
@ -24,8 +27,6 @@ typedef unsigned long uint32_t;
typedef UInt64 uint64_t; typedef UInt64 uint64_t;
typedef long intptr_t; typedef long intptr_t;
typedef unsigned long uintptr_t; typedef unsigned long uintptr_t;
#else
#include <stdint.h>
#endif #endif
#endif /* _INTTYPES_H_ */ #endif /* _INTTYPES_H_ */