Skip to content

Commit

Permalink
Fix Apple Clang build
Browse files Browse the repository at this point in the history
  • Loading branch information
RipleyTom committed Feb 24, 2024
1 parent 2b385f2 commit 04d2cf1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
3 changes: 3 additions & 0 deletions darwin/util/sysinfo_darwin.mm
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#import <Foundation/Foundation.h>
#pragma GCC diagnostic pop

namespace Darwin_Version
{
Expand Down
3 changes: 3 additions & 0 deletions rpcs3/Input/gui_pad_thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@
#include <fcntl.h>
#define CHECK_IOCTRL_RET(res) if (res == -1) { gui_log.error("gui_pad_thread: ioctl failed (errno=%d=%s)", res, strerror(errno)); }
#elif defined(__APPLE__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include <ApplicationServices/ApplicationServices.h>
#include <Carbon/Carbon.h>
#pragma GCC diagnostic pop
#endif

#include <QApplication>
Expand Down
7 changes: 7 additions & 0 deletions rpcs3/display_sleep_control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
#include <windows.h>

#elif defined(__APPLE__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include <IOKit/pwr_mgt/IOPMLib.h>
#pragma GCC diagnostic pop

static IOPMAssertionID s_pm_assertion = kIOPMNullAssertionID;

Expand Down Expand Up @@ -78,7 +81,11 @@ void disable_display_sleep()
#ifdef _WIN32
SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED);
#elif defined(__APPLE__)
#pragma GCC diagnostic push
// Necessary as some of those values are macro using old casts
#pragma GCC diagnostic ignored "-Wold-style-cast"
IOPMAssertionCreateWithName(kIOPMAssertionTypePreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, CFSTR("Game running"), &s_pm_assertion);
#pragma GCC diagnostic pop
#elif defined(HAVE_QTDBUS)
for (const char* service : { "org.freedesktop.ScreenSaver", "org.mate.ScreenSaver" })
{
Expand Down

0 comments on commit 04d2cf1

Please sign in to comment.