OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 08:30:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #146 from yuriks/inttypes

Browse Source 
Use std sized types instead of platform specific typedefs
This commit is contained in:
bunnei 2014-10-23 16:29:42 -04:00
commit 424fe27844
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/common_types.h
View File

@ -25,39 +25,18 @@
#pragma once #pragma once
#include <cmath> #include <cmath>
#include <cstdint>
#include <xmmintrin.h> // data_types__m128.cpp #include <xmmintrin.h> // data_types__m128.cpp
#ifdef _WIN32 typedef std::uint8_t u8; ///< 8-bit unsigned byte
typedef std::uint16_t u16; ///< 16-bit unsigned short
typedef std::uint32_t u32; ///< 32-bit unsigned word
typedef std::uint64_t u64; ///< 64-bit unsigned int
#include <tchar.h> typedef std::int8_t s8; ///< 8-bit signed byte
typedef std::int16_t s16; ///< 16-bit signed short
typedef unsigned __int8 u8; ///< 8-bit unsigned byte typedef std::int32_t s32; ///< 32-bit signed word
typedef unsigned __int16 u16; ///< 16-bit unsigned short typedef std::int64_t s64; ///< 64-bit signed int
typedef unsigned __int32 u32; ///< 32-bit unsigned word
typedef unsigned __int64 u64; ///< 64-bit unsigned int
typedef signed __int8 s8; ///< 8-bit signed byte
typedef signed __int16 s16; ///< 16-bit signed short
typedef signed __int32 s32; ///< 32-bit signed word
typedef signed __int64 s64; ///< 64-bit signed int
#else
typedef unsigned char u8; ///< 8-bit unsigned byte
typedef unsigned short u16; ///< 16-bit unsigned short
typedef unsigned int u32; ///< 32-bit unsigned word
typedef unsigned long long u64; ///< 64-bit unsigned int
typedef signed char s8; ///< 8-bit signed byte
typedef signed short s16; ///< 16-bit signed short
typedef signed int s32; ///< 32-bit signed word
typedef signed long long s64; ///< 64-bit signed int
// For using windows lock code
#define TCHAR char
#define LONG int
#endif // _WIN32
typedef float f32; ///< 32-bit floating point typedef float f32; ///< 32-bit floating point
typedef double f64; ///< 64-bit floating point typedef double f64; ///< 64-bit floating point

1
src/common/file_util.cpp
View File

@ -13,6 +13,7 @@
#include <commdlg.h> // for GetSaveFileName #include <commdlg.h> // for GetSaveFileName
#include <io.h> #include <io.h>
#include <direct.h> // getcwd #include <direct.h> // getcwd
#include <tchar.h>
#else #else
#include <sys/param.h> #include <sys/param.h>
#include <dirent.h> #include <dirent.h>