mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
Make GCC *printf_nowarn behavior conditional on compiling as C++
git-svn-id: https://svn.eduke32.com/eduke32@3190 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
3c651e0a53
commit
626180dd3f
1 changed files with 6 additions and 3 deletions
|
@ -677,8 +677,10 @@ char *Bstrupr(char *);
|
|||
var = print_func(fmt, ## __VA_ARGS__); \
|
||||
} while (0)
|
||||
|
||||
#ifdef __cplusplus
|
||||
#ifdef _MSC_VER
|
||||
// TODO: add MSVC pragmas to disable equivalent warning, if necessary later
|
||||
#ifndef _MSC_VER
|
||||
#else
|
||||
#ifdef _WIN32
|
||||
// MinGW's _Pragma is completely broken so our GCC NOWARN macro is useless there
|
||||
#pragma GCC diagnostic ignored "-Wformat"
|
||||
|
@ -693,8 +695,9 @@ char *Bstrupr(char *);
|
|||
#define NOWARN_RETURN(print_func, var, fmt, ...) do { _Pragma("GCC diagnostic ignored \"-Wformat\"") \
|
||||
var = print_func(fmt, ## __VA_ARGS__); \
|
||||
_Pragma("GCC diagnostic warning \"-Wformat\"") } while (0)
|
||||
#endif
|
||||
#endif
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
#endif // __cplusplus
|
||||
|
||||
#define OSD_Printf_nowarn(fmt, ...) NOWARN(OSD_Printf, fmt, ## __VA_ARGS__)
|
||||
#define Bsprintf_nowarn(fmt, ...) NOWARN(Bsprintf, fmt, ## __VA_ARGS__)
|
||||
|
|
Loading…
Reference in a new issue