From 44c8859bdae6427a03ce9f5fb484eb201921150d Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sun, 7 Apr 2013 14:08:20 -0700 Subject: [PATCH] Fixed MinGW warnings. --- 3rdparty/fcpp/cpp6.c | 3 +-- src/renderer_d3d.h | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/3rdparty/fcpp/cpp6.c b/3rdparty/fcpp/cpp6.c index 40acf354..db0c6590 100644 --- a/3rdparty/fcpp/cpp6.c +++ b/3rdparty/fcpp/cpp6.c @@ -26,7 +26,6 @@ SOFTWARE. INLINE FILE_LOCAL void outadefine(struct Global *, DEFBUF *); INLINE FILE_LOCAL void domsg(struct Global *, ErrorCode, va_list); -FILE_LOCAL char *incmem(struct Global *, char *, int); /* * skipnl() skips over input text to the end of the line. @@ -193,7 +192,7 @@ ReturnCode macroid(struct Global *global, int *c) if (global->infile != NULL && global->infile->fp != NULL) global->recursion = 0; while (type[*c] == LET && (dp = lookid(global, *c)) != NULL) { - if(ret=expand(global, dp)) + if((ret=expand(global, dp))) return(ret); *c = get(global); } diff --git a/src/renderer_d3d.h b/src/renderer_d3d.h index 67a4e631..44fe4b21 100644 --- a/src/renderer_d3d.h +++ b/src/renderer_d3d.h @@ -6,16 +6,18 @@ #ifndef __RENDERER_D3D_H__ #define __RENDERER_D3D_H__ -#if BGFX_CONFIG_RENDERER_DIRECT3D9 +#if BGFX_CONFIG_DEBUG && BGFX_CONFIG_RENDERER_DIRECT3D9 # include # include -# pragma comment(lib, "dxerr.lib") +# if BX_COMPILER_MSVC +# pragma comment(lib, "dxerr.lib") +# endif // BX_COMPILER_MSVC # define DX_CHECK_EXTRA_F " (%s): %s" # define DX_CHECK_EXTRA_ARGS , DXGetErrorString(__hr__), DXGetErrorDescription(__hr__) #else # define DX_CHECK_EXTRA_F "" # define DX_CHECK_EXTRA_ARGS -#endif // BGFX_CONFIG_RENDERER_DIRECT3D9 +#endif // BGFX_CONFIG_DEBUG && BGFX_CONFIG_RENDERER_DIRECT3D9 namespace bgfx {