Fixed MinGW warnings.

This commit is contained in:
bkaradzic 2013-04-07 14:08:20 -07:00
parent dc8d2c38f3
commit 44c8859bda
2 changed files with 6 additions and 5 deletions

View file

@ -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);
}

View file

@ -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 <sal.h>
# include <dxerr.h>
# 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
{