Re-add Types.h, remove some more #ifdef

src/System.h

@@ -1,12 +1,7 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#ifndef __LIBRETRO__
-#include <zlib.h>
-#include "common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "common/Types.h"
 
 #define winlog log
 

src/common/Patch.h

@@ -1,11 +1,7 @@
 #ifndef PATCH_H
 #define PATCH_H
 
-#ifndef __LIBRETRO__
-#include "cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "Types.h"
 
 bool applyPatch(const char *patchname, uint8_t **rom, int *size);
 

src/common/Port.h

@@ -1,11 +1,7 @@
 #ifndef PORT_H
 #define PORT_H
 
-#ifndef __LIBRETRO__
-#include "cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "Types.h"
 
 #ifdef __CELLOS_LV2__
 /* PlayStation3 */

src/gb/gbGlobals.cpp

@@ -1,5 +1,5 @@
 #include <cstddef>
-#include "../common/cstdint.h"
+#include "../common/Types.h"
 
 uint8_t* gbMemoryMap[16];
 

src/gb/gbGlobals.h

@@ -1,7 +1,7 @@
 #ifndef GBGLOBALS_H
 #define GBGLOBALS_H
 
-#include "../common/cstdint.h"
+#include "../common/Types.h"
 
 extern int gbRomSizeMask;
 extern int gbRomSize;

src/gb/gbMemory.h

@@ -1,7 +1,7 @@
 #ifndef GBMEMORY_H
 #define GBMEMORY_H
 
-#include "../common/cstdint.h"
+#include "../common/Types.h"
 #include <time.h>
 
 struct mapperMBC1 {

src/gba/BreakpointStructures.h

@@ -1,11 +1,7 @@
 #ifndef VBA_BKS_H
 #define VBA_BKS_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "../common/Types.h"
 
 #define readWord(addr) \
     ((map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]) + ((map[(addr + 1) >> 24].address[(addr + 1) & map[(addr + 1) >> 24].mask]) << 8) + ((map[(addr + 2) >> 24].address[(addr + 2) & map[(addr + 2) >> 24].mask]) << 16) + ((map[(addr + 3) >> 24].address[(addr + 3) & map[(addr + 3) >> 24].mask]) << 24))

src/gba/EEprom.h

@@ -1,13 +1,7 @@
 #ifndef EEPROM_H
 #define EEPROM_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
-
-#include <zlib.h>
+#include "../common/Types.h"
 
 #ifdef __LIBRETRO__
 extern void eepromSaveGame(uint8_t*& data);

src/gba/Flash.h

@@ -1,12 +1,7 @@
 #ifndef FLASH_H
 #define FLASH_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#include <zlib.h>
-#else
-#include <stdint.h>
-#endif
+#include "../common/Types.h"
 
 #define FLASH_128K_SZ 0x20000
 

src/gba/GBA.h

@@ -1,12 +1,7 @@
 #ifndef GBA_H
 #define GBA_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
-
+#include "../common/Types.h"
 #include "../System.h"
 
 const uint64_t TICKS_PER_SECOND = 16777216;

src/gba/GBASockClient.h

@@ -1,10 +1,6 @@
 #pragma once
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "../common/Types.h"
 
 #include <SFML/Network.hpp>
 

src/gba/Sram.h

@@ -1,11 +1,7 @@
 #ifndef SRAM_H
 #define SRAM_H
 
-#ifndef __LIBRETRO__
-#include "../common/cstdint.h"
-#else
-#include <stdint.h>
-#endif
+#include "../common/Types.h"
 
 uint8_t sramRead(uint32_t address);
 void sramWrite(uint32_t address, uint8_t byte);

src/sdl/filters.h

@@ -19,8 +19,7 @@
 #ifndef VBA_SDL_FILTERS_H
 #define VBA_SDL_FILTERS_H
 
-#include "../common/cstdint.h"
-
+#include "../common/Types.h"
 #include "../System.h"
 
 //