From cb3afe8f702195e5435744a19f153717101356f1 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 2 Oct 2013 20:46:46 -0400 Subject: [PATCH] Warning fixes: - Don't use %lu for size_t; they're different on Linux x86. - has_warned_about_drivers is only used on win32, so only declare it there to avoid a unused variable warning. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp | 2 ++ Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp | 4 ++-- Source/Core/DolphinWX/Src/ISOProperties.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp index d4b2db5d87..f5e6aa6d98 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp @@ -523,7 +523,9 @@ libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum) if (cnt < 0) return NULL; +#ifdef _WIN32 static bool has_warned_about_drivers = false; +#endif for (i = 0; i < cnt; i++) { libusb_device *device = list[i]; diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp index f0fd91abdb..3e02c96272 100644 --- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp @@ -108,9 +108,9 @@ void CARCodeAddEdit::SaveCheatData(wxCommandEvent& WXUNUSED (event)) } // If the above-mentioned conditions weren't met, then something went wrong. - if (!PanicYesNoT("Unable to parse line %lu of the entered AR code as a valid " + if (!PanicYesNoT("Unable to parse line %u of the entered AR code as a valid " "encrypted or decrypted code. Make sure you typed it correctly.\n" - "Would you like to ignore this line and continue parsing?", i + 1)) + "Would you like to ignore this line and continue parsing?", (unsigned) (i + 1))) { return; } diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 6bbbfa467c..e5943ef8cf 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -887,7 +887,7 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event) } else { - PanicAlertT("Partition doesn't exist: %lu", partitionNum); + PanicAlertT("Partition doesn't exist: %u", (unsigned) partitionNum); return; } }