From fc73f3e553c60e8fe8ca05179767dcfeded1b043 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 5 Aug 2016 23:57:47 +0200 Subject: (vita) Prevent conflicting types --- src/gfx.h | 8 ++++---- src/globals.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gfx.h b/src/gfx.h index 427f232..ce7efde 100644 --- a/src/gfx.h +++ b/src/gfx.h @@ -148,10 +148,10 @@ typedef struct short CentreY; } SLineMatrixData; -extern uint32 odd_high [4][16]; -extern uint32 odd_low [4][16]; -extern uint32 even_high [4][16]; -extern uint32 even_low [4][16]; +extern uint32_t odd_high [4][16]; +extern uint32_t odd_low [4][16]; +extern uint32_t even_high [4][16]; +extern uint32_t even_low [4][16]; extern SBG BG; extern uint32 DirectColourMaps [8][256]; diff --git a/src/globals.c b/src/globals.c index 62e0bce..1263298 100644 --- a/src/globals.c +++ b/src/globals.c @@ -122,10 +122,10 @@ NormalTileRenderer DrawHiResTilePtr = NULL; ClippedTileRenderer DrawHiResClippedTilePtr = NULL; LargePixelRenderer DrawLargePixelPtr = NULL; -uint32 odd_high[4][16]; -uint32 odd_low[4][16]; -uint32 even_high[4][16]; -uint32 even_low[4][16]; +uint32_t odd_high[4][16]; +uint32_t odd_low[4][16]; +uint32_t even_high[4][16]; +uint32_t even_low[4][16]; #ifdef GFX_MULTI_FORMAT -- cgit v1.2.3