ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced "unsigned __int64" by "u64". 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@433 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-09-03 00:02:21 +00:00
parent 6e2416b389
commit 36058428a0
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
View File

@ -274,7 +274,7 @@ u32 CEXIIPL::GetGCTime()
// get the time ... // get the time ...
const u32 cJanuary2000 = 0x386d35a1; // seconds between 1.1.1970 and 1.1.2000 const u32 cJanuary2000 = 0x386d35a1; // seconds between 1.1.1970 and 1.1.2000
__int64 ltime = Common::Timer::GetTimeSinceJan1970(); u64 ltime = Common::Timer::GetTimeSinceJan1970();
return ((u32)ltime - cJanuary2000 - Bias); return ((u32)ltime - cJanuary2000 - Bias);
} }

8
Source/Core/Core/Src/Plugins/Plugin_DVD.cpp
View File

@ -30,9 +30,9 @@ typedef void (__cdecl* TDVD_Initialize) (SDVDInitialize);
typedef void (__cdecl* TDVD_Shutdown) (); typedef void (__cdecl* TDVD_Shutdown) ();
typedef void (__cdecl* TDVD_SetISOFile) (const char*); typedef void (__cdecl* TDVD_SetISOFile) (const char*);
typedef BOOL (__cdecl* TDVD_GetISOName) (TCHAR*, int); typedef BOOL (__cdecl* TDVD_GetISOName) (TCHAR*, int);
typedef BOOL (__cdecl* TDVD_ReadToPtr) (LPBYTE, unsigned __int64, unsigned __int64); typedef BOOL (__cdecl* TDVD_ReadToPtr) (LPBYTE, u64, u64);
typedef BOOL (__cdecl* TDVD_IsValid) (); typedef BOOL (__cdecl* TDVD_IsValid) ();
typedef u32 (__cdecl* TDVD_Read32) (unsigned __int64); typedef u32 (__cdecl* TDVD_Read32) (u64);
//! Function Pointer //! Function Pointer
TGetDllInfo g_GetDllInfo = NULL; TGetDllInfo g_GetDllInfo = NULL;
@ -145,7 +145,7 @@ void DVD_Shutdown()
g_DVD_Shutdown(); g_DVD_Shutdown();
} }
bool DVD_ReadToPtr(LPBYTE ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwLength) bool DVD_ReadToPtr(LPBYTE ptr, u64 _dwOffset, u64 _dwLength)
{ {
return (g_DVD_ReadToPtr(ptr, _dwOffset, _dwLength) == TRUE) ? true : false; return (g_DVD_ReadToPtr(ptr, _dwOffset, _dwLength) == TRUE) ? true : false;
} }
@ -155,7 +155,7 @@ bool DVD_IsValid()
return (g_DVD_IsValid() == TRUE) ? true : false; return (g_DVD_IsValid() == TRUE) ? true : false;
} }
u32 DVD_Read32(unsigned __int64 _dwOffset) u32 DVD_Read32(u64 _dwOffset)
{ {
return g_DVD_Read32(_dwOffset); return g_DVD_Read32(_dwOffset);
} }

4
Source/Core/Core/Src/Plugins/Plugin_DVD.h
View File

@ -58,13 +58,13 @@ void DVD_SetISOFile(const char* _szFilename);
BOOL DVD_GetISOName(TCHAR * _szFilename, int maxlen); BOOL DVD_GetISOName(TCHAR * _szFilename, int maxlen);
//! DVDReadToPtr //! DVDReadToPtr
bool DVD_ReadToPtr(LPBYTE ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwLength); bool DVD_ReadToPtr(LPBYTE ptr, u64 _dwOffset, u64 _dwLength);
//! DVD_IsValid //! DVD_IsValid
bool DVD_IsValid(); bool DVD_IsValid();
//! DVDRead32 //! DVDRead32
u32 DVD_Read32(unsigned __int64 _dwOffset); u32 DVD_Read32(u64 _dwOffset);
//! SaveLoadState //! SaveLoadState
u32 SaveLoadState(char *ptr, BOOL save); u32 SaveLoadState(char *ptr, BOOL save);

4
Source/Core/Core/Src/VolumeHandler.cpp
View File

@ -50,7 +50,7 @@ u32 Read32(u64 _Offset)
return 0; return 0;
} }
bool ReadToPtr(u8* ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwLength) bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength)
{ {
if (g_pVolume != NULL) if (g_pVolume != NULL)
{ {
@ -74,4 +74,4 @@ bool IsWii()
return false; return false;
} }
} }

4
Source/Core/Core/Src/VolumeHandler.h
View File

@ -19,7 +19,7 @@
#define _VOLUMEHANDLER_H #define _VOLUMEHANDLER_H
#include <string> #include <string>
#include "Common.h" #include "CommonTypes.h"
#include "Volume.h" #include "Volume.h"
@ -30,7 +30,7 @@ void SetVolumeName(const std::string& _rFullPath);
u32 Read32(u64 _Offset); u32 Read32(u64 _Offset);
bool ReadToPtr(u8* ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwLength); bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength);
bool IsValid(); bool IsValid();

1
Source/PluginSpecs/CommonTypes.h
View File

@ -50,7 +50,6 @@ typedef char s8;
typedef short s16; typedef short s16;
typedef int s32; typedef int s32;
typedef long long s64; typedef long long s64;
#define __int64 long long
#define TCHAR char #define TCHAR char