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

Misc: Fix building with gcc14 (#11278)

This commit is contained in:
Ziemas 2024-05-21 04:25:11 +02:00 committed by GitHub
parent 4536daa5f8
commit 086bbf95dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/SmallString.h
View File

@ -343,7 +343,7 @@ private:
#endif #endif
template <u32 L> template <u32 L>
__fi SmallStackString<L> SmallStackString<L>::from_sprintf(const char* format, ...) SmallStackString<L> SmallStackString<L>::from_sprintf(const char* format, ...)
{ {
std::va_list ap; std::va_list ap;
va_start(ap, format); va_start(ap, format);

1
pcsx2/CDVD/ThreadedFileReader.cpp
View File

@ -4,6 +4,7 @@
#include "ThreadedFileReader.h" #include "ThreadedFileReader.h"
#include "common/Threading.h" #include "common/Threading.h"
#include <cstring>
// Make sure buffer size is bigger than the cutoff where PCSX2 emulates a seek // Make sure buffer size is bigger than the cutoff where PCSX2 emulates a seek
// If buffers are smaller than that, we can't keep up with linear reads // If buffers are smaller than that, we can't keep up with linear reads

2
pcsx2/Input/SDLInputSource.cpp
View File

@ -790,7 +790,7 @@ bool SDLInputSource::CloseDevice(int joystick_index)
return false; return false;
InputManager::OnInputDeviceDisconnected( InputManager::OnInputDeviceDisconnected(
{{.source_type = InputSourceType::SDL, .source_index = static_cast<u32>(it->player_id)}}, {InputBindingKey{.source_type = InputSourceType::SDL, .source_index = static_cast<u32>(it->player_id)}},
fmt::format("SDL-{}", it->player_id)); fmt::format("SDL-{}", it->player_id));
if (it->haptic) if (it->haptic)

2
pcsx2/SPU2/Dma.h
View File

@ -3,6 +3,8 @@
#pragma once #pragma once
#include "common/Pcsx2Types.h"
#define MADR (Index == 0 ? HW_DMA4_MADR : HW_DMA7_MADR) #define MADR (Index == 0 ? HW_DMA4_MADR : HW_DMA7_MADR)
#define TADR (Index == 0 ? HW_DMA4_TADR : HW_DMA7_TADR) #define TADR (Index == 0 ? HW_DMA4_TADR : HW_DMA7_TADR)

1
pcsx2/SPU2/defs.h
View File

@ -5,6 +5,7 @@
#include "GS/MultiISA.h" #include "GS/MultiISA.h"
#include <algorithm>
#include <array> #include <array>
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------