zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make GCC *printf_nowarn behavior conditional on compiling as C++

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3190 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-11-15 23:35:40 +00:00
parent 3c651e0a53
commit 626180dd3f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/build/include/compat.h
View file

@ -677,8 +677,10 @@ char *Bstrupr(char *);
var = print_func(fmt, ## __VA_ARGS__); \ var = print_func(fmt, ## __VA_ARGS__); \
} while (0) } while (0)
#ifdef __cplusplus
#ifdef _MSC_VER
// TODO: add MSVC pragmas to disable equivalent warning, if necessary later // TODO: add MSVC pragmas to disable equivalent warning, if necessary later
#ifndef _MSC_VER #else
#ifdef _WIN32 #ifdef _WIN32
// MinGW's _Pragma is completely broken so our GCC NOWARN macro is useless there // MinGW's _Pragma is completely broken so our GCC NOWARN macro is useless there
#pragma GCC diagnostic ignored "-Wformat" #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\"") \ #define NOWARN_RETURN(print_func, var, fmt, ...) do { _Pragma("GCC diagnostic ignored \"-Wformat\"") \
var = print_func(fmt, ## __VA_ARGS__); \ var = print_func(fmt, ## __VA_ARGS__); \
_Pragma("GCC diagnostic warning \"-Wformat\"") } while (0) _Pragma("GCC diagnostic warning \"-Wformat\"") } while (0)
#endif #endif // _WIN32
#endif #endif // _MSC_VER
#endif // __cplusplus
#define OSD_Printf_nowarn(fmt, ...) NOWARN(OSD_Printf, fmt, ## __VA_ARGS__) #define OSD_Printf_nowarn(fmt, ...) NOWARN(OSD_Printf, fmt, ## __VA_ARGS__)
#define Bsprintf_nowarn(fmt, ...) NOWARN(Bsprintf, fmt, ## __VA_ARGS__) #define Bsprintf_nowarn(fmt, ...) NOWARN(Bsprintf, fmt, ## __VA_ARGS__)