summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2010-05-02 21:12:51 +0000
committerShawn Hoffman <godisgovernment@gmail.com>2010-05-02 21:12:51 +0000
commit6c407b5fa0121968c83992a2c8134692a70b82ed (patch)
treefd44692848910f1575b32ba9db2f0a625246866c /Source/Core
parent66ffa3b04590ced0dff0fde1bdc12d572e5de4bd (diff)
OS X buildfix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5429 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Common/Src/CommonTypes.h8
-rw-r--r--Source/Core/DolphinWX/Src/NetPlay.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Common/Src/CommonTypes.h b/Source/Core/Common/Src/CommonTypes.h
index 3f1f98e3d6..2482a8822d 100644
--- a/Source/Core/Common/Src/CommonTypes.h
+++ b/Source/Core/Common/Src/CommonTypes.h
@@ -46,10 +46,10 @@ typedef unsigned short u16;
typedef unsigned int u32;
typedef unsigned long long u64;
-typedef char s8;
-typedef short s16;
-typedef int s32;
-typedef long long s64;
+typedef signed char s8;
+typedef signed short s16;
+typedef signed int s32;
+typedef signed long long s64;
#endif
// For using windows lock code
diff --git a/Source/Core/DolphinWX/Src/NetPlay.cpp b/Source/Core/DolphinWX/Src/NetPlay.cpp
index 7eb290b222..fc2b48017a 100644
--- a/Source/Core/DolphinWX/Src/NetPlay.cpp
+++ b/Source/Core/DolphinWX/Src/NetPlay.cpp
@@ -400,7 +400,7 @@ void NetPlay::UpdateGUI()
if (m_dialog)
{
wxCommandEvent evt(wxEVT_THREAD, 1);
- m_dialog->AddPendingEvent(evt);
+ m_dialog->GetEventHandler()->AddPendingEvent(evt);
}
}
@@ -586,7 +586,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
// update gui
wxCommandEvent evt(wxEVT_THREAD, 45);
evt.SetString(wxString(m_selected_game.c_str(), *wxConvCurrent));
- m_dialog->AddPendingEvent(evt);
+ m_dialog->GetEventHandler()->AddPendingEvent(evt);
}
break;
@@ -594,7 +594,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
{
// kinda silly
wxCommandEvent evt(wxEVT_THREAD, 46);
- m_dialog->AddPendingEvent(evt);
+ m_dialog->GetEventHandler()->AddPendingEvent(evt);
}
break;