From: twinaphex Date: Sun, 12 Jul 2020 17:10:14 +0000 (+0200) Subject: Prevent collission with PS2 SDK X-Git-Tag: v2.00~710 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6a52e1940bb0402b85d1b72a0835c7ea83ff1e0;p=picodrive.git Prevent collission with PS2 SDK --- diff --git a/pico/pico_types.h b/pico/pico_types.h index c1a7db8a..c5ea8098 100644 --- a/pico/pico_types.h +++ b/pico/pico_types.h @@ -3,6 +3,7 @@ #include +#ifndef __TAMTYPES_H__ #ifndef UTYPES_DEFINED typedef uint8_t u8; typedef int8_t s8; @@ -11,6 +12,8 @@ typedef int16_t s16; typedef uint32_t u32; typedef int32_t s32; #endif +#endif + typedef uintptr_t uptr; /* unsigned pointer-sized int */ #endif