diff options
| author | twinaphex | 2016-08-05 23:57:47 +0200 |
|---|---|---|
| committer | twinaphex | 2016-08-05 23:57:47 +0200 |
| commit | fc73f3e553c60e8fe8ca05179767dcfeded1b043 (patch) | |
| tree | 8426da6d2e0229062c517de5ba7fe4438c6f0ab6 | |
| parent | 142a473450f4738dceefbfe6c69272d35b7a5652 (diff) | |
| download | snes9x2002-fc73f3e553c60e8fe8ca05179767dcfeded1b043.tar.gz snes9x2002-fc73f3e553c60e8fe8ca05179767dcfeded1b043.tar.bz2 snes9x2002-fc73f3e553c60e8fe8ca05179767dcfeded1b043.zip | |
(vita) Prevent conflicting types
| -rw-r--r-- | src/gfx.h | 8 | ||||
| -rw-r--r-- | src/globals.c | 8 |
2 files changed, 8 insertions, 8 deletions
@@ -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 |