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

Revert "compat.h: slightly reformat the NOWARN-related preprocessor directives."

Browse source 
Commit breaks MSVC builds by failing to provide NOWARN macros to MSVC.

git-svn-id: https://svn.eduke32.com/eduke32@3232 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-11-25 13:54:33 +00:00
parent befdb5d3d8
commit 65104593e1
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -669,35 +669,34 @@ static inline char *Bstrncpyz(char *dst, const char *src, bsize_t n)
if (fileptr) { Bfclose(fileptr); fileptr=NULL; } \
} while (0)
// Make into an #if 1 to enable format-related warnings in C++:
#ifndef __cplusplus
#define NOWARN(print_func, fmt, ...) do { \
#define NOWARN(print_func, fmt, ...) do { \
print_func(fmt, ## __VA_ARGS__); \
} while (0)
#define NOWARN_RETURN(print_func, var, fmt, ...) do { \
#define NOWARN_RETURN(print_func, var, fmt, ...) do { \
var = print_func(fmt, ## __VA_ARGS__); \
} while (0)
#else
// builing in C++
# if defined _MSC_VER
#ifdef __cplusplus
#ifdef _MSC_VER
// TODO: add MSVC pragmas to disable equivalent warning, if necessary later
# elif defined _WIN32
#else
#ifdef _WIN32
// MinGW's _Pragma is completely broken so our GCC NOWARN macro is useless there
#pragma GCC diagnostic ignored "-Wformat"
# else
#define NOWARN(print_func, fmt, ...) do { _Pragma("GCC diagnostic ignored \"-Wformat\"") \
#pragma GCC diagnostic ignored "-Wformat"
#else
#undef NOWARN
#undef NOWARN_RETURN
#define NOWARN(print_func, fmt, ...) do { _Pragma("GCC diagnostic ignored \"-Wformat\"") \
print_func(fmt, ## __VA_ARGS__); \
_Pragma("GCC diagnostic warning \"-Wformat\"") } while (0)
#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__); \
_Pragma("GCC diagnostic warning \"-Wformat\"") } while (0)
# endif // compiler/environment
#endif // _WIN32
#endif // _MSC_VER
#endif // __cplusplus
#define OSD_Printf_nowarn(fmt, ...) NOWARN(OSD_Printf, fmt, ## __VA_ARGS__)
@ -707,3 +706,4 @@ static inline char *Bstrncpyz(char *dst, const char *src, bsize_t n)
#define message_nowarn(fmt, ...) NOWARN(message, fmt, ## __VA_ARGS__)
#endif // __compat_h__