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

compile fix linux 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2505 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-03-01 12:39:21 +00:00
parent 7607d6dc6a
commit 2f378cb154
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/Src/IPC_HLE/hci.h
View File

@ -1,18 +1,9 @@
#ifndef _NETBT_HCI_H_
#define _NETBT_HCI_H_
#include "CommonTypes.h"
#pragma pack(push, 1)
typedef u8 uint8_t;
#ifdef _WIN32
typedef s8 int8_t;
#endif
typedef u16 uint16_t;
typedef s16 int16_t;
typedef u32 uint32_t;
typedef s32 int32_t;
#ifdef __cplusplus
extern "C" {
#endif

6
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -128,7 +128,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
wxString name;
CopySJISToString(name, OpenGameListItem->GetName(0).c_str());
SetTitle(wxString::Format(_("%s%s: %s - %s"), filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str(), name));
SetTitle(wxString::Format(_("%s%s: %s - %s"), filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str(), name.c_str()));
}
CISOProperties::~CISOProperties()
@ -785,7 +785,7 @@ void CISOProperties::ChangeBannerDetails(int lang)
CopySJISToString(description, OpenGameListItem->GetDescription(lang).c_str());
m_ShortName->SetValue(name);
m_Maker->SetValue(OpenGameListItem->GetCompany().c_str());//dev too
m_Maker->SetValue(wxString::FromAscii(OpenGameListItem->GetCompany().c_str()));//dev too
m_Comment->SetValue(description);
}
@ -836,4 +836,4 @@ bool CISOProperties::CopySJISToString( wxString& _rDestination, const char* _src
//returnCode = true;
#endif
return returnCode;
}
}

2
Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
View File

@ -1176,7 +1176,7 @@ bool GCMemcard::formatWIP(int slot, bool New, bool sjis)
}
fread(&m_SRAM, 1, 64, pStream);
fclose(pStream);
rand = time = 0XFAB12B2D9FD80700;//0x500;//gettime();
rand = time = 0XFAB12B2D9FD80700ULL;//0x500;//gettime();
//////////////////////////////////////