From 5fff97f3f433370c15d522147232168365cbe6e8 Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 13 Apr 2015 02:26:52 -0400 Subject: [PATCH 1/2] Fix printf width in TraversalServer. --- Source/Core/Common/TraversalServer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/TraversalServer.cpp b/Source/Core/Common/TraversalServer.cpp index 097d812ddd..6631b6359a 100644 --- a/Source/Core/Common/TraversalServer.cpp +++ b/Source/Core/Common/TraversalServer.cpp @@ -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) From 8ebe3d34789e3a45400e4fca9d914a8aa32342be Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 13 Apr 2015 02:27:08 -0400 Subject: [PATCH 2/2] Remove unused field. --- Source/Core/DolphinWX/Config/WiiConfigPane.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.h b/Source/Core/DolphinWX/Config/WiiConfigPane.h index b7ab61b5a4..72ea81548a 100644 --- a/Source/Core/DolphinWX/Config/WiiConfigPane.h +++ b/Source/Core/DolphinWX/Config/WiiConfigPane.h @@ -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; };