libretro: Use stdint.h instead in most cases

src/System.h

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

src/common/Patch.h

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

src/common/Port.h

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

src/gba/BreakpointStructures.h

@@ -1,7 +1,11 @@
 #ifndef VBA_BKS_H
 #define VBA_BKS_H
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
 
 #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,7 +1,12 @@
 #ifndef EEPROM_H
 #define EEPROM_H
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
+
 #include <zlib.h>
 
 #ifdef __LIBRETRO__

src/gba/Flash.h

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

src/gba/GBA.h

@@ -1,7 +1,11 @@
 #ifndef GBA_H
 #define GBA_H
 
+#ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#else
+#include <stdint.h>
+#endif
 
 #include "../System.h"
 

src/gba/GBASockClient.h

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

src/gba/Sram.h

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

src/libretro/SoundRetro.cpp

@@ -15,7 +15,6 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-#include "../common/cstdint.h"
 #include "SoundRetro.h"
 #include "libretro.h"
 unsigned g_audio_frames;

src/libretro/libretro.cpp

@@ -1,4 +1,3 @@
-#include "../common/cstdint.h"
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>