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

Merge pull request #2296 from comex/warning-fixes-99999 

Warning fixes 99999
This commit is contained in:
Lioncash 2015-04-13 02:35:16 -04:00
parent 59c4beb8ea 8ebe3d3478
commit a8142f8d3e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Common/TraversalServer.cpp
View File

@ -201,7 +201,8 @@ static const char* SenderName(sockaddr_in6* addr)
static void TrySend(const void* buffer, size_t size, sockaddr_in6* addr)
{
#if DEBUG
printf("-> %d %lu %s\n", ((TraversalPacket*) buffer)->type, ((TraversalPacket*) buffer)->requestId, SenderName(addr));
printf("-> %d %llu %s\n", ((TraversalPacket*) buffer)->type,
(long long)((TraversalPacket*) buffer)->requestId, SenderName(addr));
#endif
if ((size_t) sendto(sock, buffer, size, 0, (sockaddr*) addr, sizeof(*addr)) != size)
{
@ -270,7 +271,7 @@ static void ResendPackets()
static void HandlePacket(TraversalPacket* packet, sockaddr_in6* addr)
{
#if DEBUG
printf("<- %d %lu %s\n", packet->type, packet->requestId, SenderName(addr));
printf("<- %d %llu %s\n", packet->type, (long long)packet->requestId, SenderName(addr));
#endif
bool packetOk = true;
switch (packet->type)

1
Source/Core/DolphinWX/Config/WiiConfigPane.h
View File

@ -40,5 +40,4 @@ private:
wxCheckBox* m_connect_keyboard_checkbox;
wxChoice* m_system_language_choice;
wxChoice* m_aspect_ratio_choice;
wxChoice* m_sensor_bar_position_choice;
};