diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-07-15 14:38:49 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-07-15 14:38:49 +1000 |
| commit | 679961a25ebfe5f6f858811c9a27dd3ddc3fb9aa (patch) | |
| tree | e92278f0118fc9ebaabb4b0f6a3aa4d95ddeec86 /src | |
| parent | 8c47f68f665a400fd0489041d707b4371308a67e (diff) | |
| download | uGFX-679961a25ebfe5f6f858811c9a27dd3ddc3fb9aa.tar.gz uGFX-679961a25ebfe5f6f858811c9a27dd3ddc3fb9aa.tar.bz2 uGFX-679961a25ebfe5f6f858811c9a27dd3ddc3fb9aa.zip | |
Try to prevent type definition conflicts with standard headers
Diffstat (limited to 'src')
| -rw-r--r-- | src/gos/raw32.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/gos/raw32.h b/src/gos/raw32.h index 6eb5f26e..5a6a2aa7 100644 --- a/src/gos/raw32.h +++ b/src/gos/raw32.h @@ -42,14 +42,20 @@ /*===========================================================================*/ typedef unsigned char bool_t; -typedef char int8_t; -typedef unsigned char uint8_t; -typedef short int16_t; -typedef unsigned short uint16_t; -typedef int int32_t; -typedef unsigned int uint32_t; - -typedef uint32_t size_t; + +#ifndef _STDINT_H + typedef char int8_t; + typedef unsigned char uint8_t; + typedef short int16_t; + typedef unsigned short uint16_t; + typedef int int32_t; + typedef unsigned int uint32_t; +#endif + +#if !defined (__need_size_t) && !defined (_STDDEF_H_) + typedef uint32_t size_t; +#endif + typedef uint32_t delaytime_t; typedef uint32_t systemticks_t; typedef short semcount_t; |