Fixed MinGW warnings.

This commit is contained in:
bkaradzic 2013-04-07 23:53:58 -07:00
parent 253f313a34
commit 159b1ce8b2
6 changed files with 18 additions and 19 deletions

View file

@ -224,7 +224,7 @@ ReturnCode cppmain(struct Global *global)
include = global->included;
while(include--) {
openinclude(global, global->include[include], TRUE);
openinclude(global, global->include[(unsigned)include], TRUE);
}
for (;;) {
@ -310,7 +310,7 @@ ReturnCode cppmain(struct Global *global)
Putstring(global, global->spacebuf); /* Output all whitespaces */
}
}
if(ret=macroid(global, &c)) /* Grab the token */
if((ret=macroid(global, &c))) /* Grab the token */
return(ret);
} while (type[c] == LET && catenate(global, &ret) && !ret);
if(ret)

10
3rdparty/fcpp/cpp2.c vendored
View file

@ -205,7 +205,7 @@ ReturnCode control( struct Global *global,
while( c != '\n' && c != EOF_CHAR )
{
if( ret = save( global, c ) )
if( (ret = save( global, c )) )
return(ret);
c = get( global );
@ -213,7 +213,7 @@ ReturnCode control( struct Global *global,
unget( global );
if( ret = save( global, EOS ) )
if( (ret = save( global, EOS )) )
return(ret);
/*
@ -222,7 +222,7 @@ ReturnCode control( struct Global *global,
*/
global->line = atoi(global->work) - 1; /* Reset line number */
for( tp = global->work; isdigit(*tp) || type[*tp] == SPA; tp++)
for( tp = global->work; isdigit(*tp) || type[(unsigned)*tp] == SPA; tp++)
; /* Skip over digits */
if( *tp != EOS )
@ -559,7 +559,7 @@ ReturnCode doinclude( struct Global *global )
delim = skipws( global );
if( ret = macroid( global, &delim ) )
if( (ret = macroid( global, &delim )) )
return(ret);
if( delim != '<' && delim != '"' )
@ -575,7 +575,7 @@ ReturnCode doinclude( struct Global *global )
global->workp = global->work;
while( (c = get(global)) != '\n' && c != EOF_CHAR )
if( ret = save( global, c ) ) /* Put it away. */
if( (ret = save( global, c )) ) /* Put it away. */
return( ret );
unget( global ); /* Force nl after include */

View file

@ -176,9 +176,9 @@ int dooptions(struct Global *global, struct fppTag *tags)
cfatal(global, FATAL_TOO_MANY_INCLUDE_FILES);
return(FPP_TOO_MANY_INCLUDE_FILES);
}
global->include[global->included] = (char *)tags->data;
global->include[(unsigned)global->included] = (char *)tags->data;
global->includeshow[global->included] =
global->includeshow[(unsigned)global->included] =
(tags->tag == FPPTAG_INCLUDE_FILE);
global->included++;
@ -202,7 +202,7 @@ int dooptions(struct Global *global, struct fppTag *tags)
char *text=(char *)tags->data;
sizp = size_table;
if (isdatum = (*text != '*')) /* If it's just -S, */
if ((isdatum = (*text != '*'))) /* If it's just -S, */
endtest = T_FPTR; /* Stop here */
else { /* But if it's -S* */
text++; /* Step over '*' */

View file

@ -74,7 +74,7 @@ ReturnCode dodefine(struct Global *global)
int c;
DEFBUF *dp; /* -> new definition */
int isredefine; /* TRUE if redefined */
char *old; /* Remember redefined */
char *old = NULL; /* Remember redefined */
ReturnCode ret;
#if OK_CONCAT
int quoting; /* Remember we saw a # */
@ -141,9 +141,9 @@ ReturnCode dodefine(struct Global *global)
quoting = 1; /* Maybe quoting op. */
continue;
}
while (global->workp > global->work && type[global->workp[-1]] == SPA)
while (global->workp > global->work && type[(unsigned)*(global->workp - 1)] == SPA)
--global->workp; /* Erase leading spaces */
if(ret=save(global, TOK_SEP)) /* Stuff a delimiter */
if((ret=save(global, TOK_SEP))) /* Stuff a delimiter */
return(ret);
c = skipws(global); /* Eat whitespace */
continue;

View file

@ -355,7 +355,7 @@ ReturnCode eval(struct Global *global, int *eval)
case OP_COL: /* : on stack. */
opp--; /* Unstack : */
if (opp->op != OP_QUE) { /* Matches ? on stack? */
cerror(global, ERROR_MISPLACED, opname[opp->op]);
cerror(global, ERROR_MISPLACED, opname[(unsigned)opp->op]);
*eval=1;
return(FPP_OK);
}
@ -394,7 +394,7 @@ ReturnCode evallex(struct Global *global,
loop=FALSE;
do { /* Collect the token */
c = skipws(global);
if(ret=macroid(global, &c))
if((ret=macroid(global, &c)))
return(ret);
if (c == EOF_CHAR || c == '\n') {
unget(global);
@ -535,7 +535,7 @@ ReturnCode dosizeof(struct Global *global, int *result)
*/
typecode = 0;
while ((c = skipws(global))) {
if(ret=macroid(global, &c))
if((ret=macroid(global, &c)))
return(ret);
/* (I) return on fail! */
if (c == EOF_CHAR || c == '\n') {

View file

@ -46,9 +46,8 @@ extern "C"
#include "glsl_optimizer.h"
#if BX_PLATFORM_WINDOWS
# if BX_COMPILER_GCC
# include <sal.h>
# endif // BX_COMPILER_GCC
# include <sal.h>
# define __D3DX9MATH_INL__ // not used and MinGW complains about type-punning
# include <d3dx9.h>
# include <d3dcompiler.h>
#endif // BX_PLATFORM_WINDOWS