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

Build fix for __THROWNL not being defined on libc that is used by Alpine Linux

This commit is contained in:
Matthew Budd 2020-11-28 22:38:57 -05:00
parent d13c151817
commit 4decd24bcd
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/drivers/Qt/LuaControl.h
View File

@ -3,6 +3,8 @@
#pragma once #pragma once
#include <stdio.h>
#include <QWidget> #include <QWidget>
#include <QDialog> #include <QDialog>
#include <QVBoxLayout> #include <QVBoxLayout>
@ -53,12 +55,17 @@ class LuaControlDialog_t : public QDialog
// Formatted print // Formatted print
#ifdef WIN32 #ifdef WIN32
int LuaPrintfToWindowConsole(_In_z_ _Printf_format_string_ const char* const format, ...) ; int LuaPrintfToWindowConsole(_In_z_ _Printf_format_string_ const char* const format, ...) ;
#elif __linux__ #elif __linux__
int LuaPrintfToWindowConsole(const char *__restrict format, ...) #ifdef __THROWNL
__THROWNL __attribute__ ((__format__ (__printf__, 1, 2))); int LuaPrintfToWindowConsole(const char *__restrict format, ...)
__THROWNL __attribute__ ((__format__ (__printf__, 1, 2)));
#else
int LuaPrintfToWindowConsole(const char *__restrict format, ...)
throw() __attribute__ ((__format__ (__printf__, 1, 2)));
#endif
#else #else
int LuaPrintfToWindowConsole(const char *__restrict format, ...) throw(); int LuaPrintfToWindowConsole(const char *__restrict format, ...) throw();
#endif #endif
void PrintToWindowConsole(intptr_t hDlgAsInt, const char* str); void PrintToWindowConsole(intptr_t hDlgAsInt, const char* str);

4
src/lua-engine.cpp
View File

@ -194,6 +194,10 @@ void TaseditorDisableManualFunctionIfNeeded();
#else #else
int LuaKillMessageBox(void); int LuaKillMessageBox(void);
#ifdef __linux__ #ifdef __linux__
#ifndef __THROWNL
#define __THROWNL throw () // Build fix Alpine Linux libc
#endif
int LuaPrintfToWindowConsole(const char *__restrict format, ...) int LuaPrintfToWindowConsole(const char *__restrict format, ...)
__THROWNL __attribute__ ((__format__ (__printf__, 1, 2))); __THROWNL __attribute__ ((__format__ (__printf__, 1, 2)));
#else #else