dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation issue with MSVC due to ordering of noreturn and cdecl.

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-10-31 10:51:58 +00:00
parent a0b0641a8b
commit 1234bdb07c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/saveload/saveload.cpp
View File

@@ -564,7 +564,7 @@ void NORETURN SlError(StringID string, const char *extra_msg, bool already_mallo
/** /**
* As SlError, except that it takes a format string and additional parameters * As SlError, except that it takes a format string and additional parameters
*/ */
void CDECL NORETURN SlErrorFmt(StringID string, const char *msg, ...) void NORETURN CDECL SlErrorFmt(StringID string, const char *msg, ...)
{ {
va_list va; va_list va;
va_start(va, msg); va_start(va, msg);
@@ -588,7 +588,7 @@ void NORETURN SlErrorCorrupt(const char *msg, bool already_malloced)
/** /**
* As SlErrorCorruptFmt, except that it takes a format string and additional parameters * As SlErrorCorruptFmt, except that it takes a format string and additional parameters
*/ */
void CDECL NORETURN SlErrorCorruptFmt(const char *msg, ...) void NORETURN CDECL SlErrorCorruptFmt(const char *msg, ...)
{ {
va_list va; va_list va;
va_start(va, msg); va_start(va, msg);

4
src/saveload/saveload.h
View File

@@ -631,8 +631,8 @@ void SlObject(void *object, const SaveLoad *sld);
bool SlObjectMember(void *object, const SaveLoad *sld); bool SlObjectMember(void *object, const SaveLoad *sld);
void NORETURN SlError(StringID string, const char *extra_msg = NULL, bool already_malloced = false); void NORETURN SlError(StringID string, const char *extra_msg = NULL, bool already_malloced = false);
void NORETURN SlErrorCorrupt(const char *msg, bool already_malloced = false); void NORETURN SlErrorCorrupt(const char *msg, bool already_malloced = false);
void CDECL NORETURN SlErrorFmt(StringID string, const char *msg, ...) WARN_FORMAT(2, 3); void NORETURN CDECL SlErrorFmt(StringID string, const char *msg, ...) WARN_FORMAT(2, 3);
void CDECL NORETURN SlErrorCorruptFmt(const char *msg, ...) WARN_FORMAT(1, 2); void NORETURN CDECL SlErrorCorruptFmt(const char *msg, ...) WARN_FORMAT(1, 2);
bool SaveloadCrashWithMissingNewGRFs(); bool SaveloadCrashWithMissingNewGRFs();