ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-23 07:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Make MinGW Windows GNU builds actually compile (fixes xbox build) (might still require -Wnoerror flag) (#880)

Browse Source 
* Update wad.c

* Update log.h
This commit is contained in:
momo-AUX1
2025-05-19 02:27:38 +03:00
committed by GitHub
parent 370a7bed39
commit 68f80e5a8c
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cdogs/cwolfmap/wad/wad.c
View File

@@ -29,8 +29,10 @@ static unsigned char cbuf[CBUF_LEN];
// From waderror.h
extern int waderrno;
#ifndef __MINGW32__
// From errno.h
extern int errno;
#endif
// ===========================================================================
// Common Private Functions

33
src/cdogs/log.h
View File

@@ -76,6 +76,22 @@ void LogTerminate(void);
#ifndef _WIN32
#define __pragma(x)
#endif
#if defined(_MSC_VER)
#define LOG(_module, _level, ...) \
do \
{ \
__pragma(warning(suppress : 4127)) \
if (_level >= LogModuleGetLevel(_module)) \
{ \
LogLine( \
stderr, _module, _level, __FILENAME__, __LINE__, __func__, \
##__VA_ARGS__); \
LogLine( \
gLogFile, _module, _level, __FILENAME__, __LINE__, __func__, \
##__VA_ARGS__); \
} \
} while (0)
#else
#define LOG(_module, _level, ...) \
do \
{ \
@@ -88,16 +104,25 @@ void LogTerminate(void);
gLogFile, _module, _level, __FILENAME__, __LINE__, __func__, \
##__VA_ARGS__); \
} \
__pragma(warning(suppress : 4127)) \
} while (false)
} while (0)
#endif
#if defined(_MSC_VER)
#define LOG_FLUSH() \
do \
{ \
__pragma(warning(suppress : 4127)) \
LogFlush(stderr); \
LogFlush(gLogFile); \
} while (0)
#else
#define LOG_FLUSH() \
do \
{ \
LogFlush(stderr); \
LogFlush(gLogFile); \
__pragma(warning(suppress : 4127)) \
} while (false)
} while (0)
#endif
void LogLine(
FILE *stream, const LogModule m, const LogLevel l, const char *filename,