From 6177f89c3f5c84d4885b341a23c3ed7380d3e722 Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Mon, 8 Feb 2021 20:00:05 +0000 Subject: [PATCH] DEV9: Use PS2Ext.h SysMessage() on Linux We still need to use the narrow char SysMessage() on windows --- pcsx2/DEV9/DEV9.h | 3 +++ pcsx2/DEV9/Linux/Linux.cpp | 18 ------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/pcsx2/DEV9/DEV9.h b/pcsx2/DEV9/DEV9.h index e4398ec88f..611e9dd47d 100644 --- a/pcsx2/DEV9/DEV9.h +++ b/pcsx2/DEV9/DEV9.h @@ -139,7 +139,10 @@ EXTERN int ThreadRun; extern std::string s_strIniPath; extern std::string s_strLogPath; +#ifdef _WIN32 +//Use own SysMessage for narrow char support void SysMessage(char* fmt, ...); +#endif #define DEV9_R_REV 0x1f80146e diff --git a/pcsx2/DEV9/Linux/Linux.cpp b/pcsx2/DEV9/Linux/Linux.cpp index 943c326233..321c29eada 100644 --- a/pcsx2/DEV9/Linux/Linux.cpp +++ b/pcsx2/DEV9/Linux/Linux.cpp @@ -38,24 +38,6 @@ static GtkBuilder* builder = nullptr; -void SysMessage(char* fmt, ...) -{ - va_list list; - char tmp[512]; - - va_start(list, fmt); - vsprintf(tmp, fmt, list); - va_end(list); - - GtkWidget* dialog = gtk_message_dialog_new(NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", tmp); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_hide(dialog); -} - void OnInitDialog() { char* dev;