Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
comex committed Oct 3, 2013
1 parent 1ec4894 commit cb3afe8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
Expand Up @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/Src/ISOProperties.cpp
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit cb3afe8

Please sign in to comment.