UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Windows build more.

Browse Source
This commit is contained in:
David Anderson 2014-08-22 21:07:49 -07:00
parent d20ba38d6b
commit 0cf8eb2854
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sourcepawn/compiler/sc1.cpp
View File

@ -1920,14 +1920,12 @@ static void declstructvar(char *firstname,int fpublic, pstruct_t *pstruct)
static void declglb(declinfo_t *decl,int fpublic,int fstatic,int fstock) static void declglb(declinfo_t *decl,int fpublic,int fstatic,int fstock)
{ {
int ispublic; int ispublic;
cell val,cidx; cell cidx;
ucell address; ucell address;
int glb_incr; int glb_incr;
char *str;
int slength=0; int slength=0;
short filenum; short filenum;
symbol *sym; symbol *sym;
constvalue *enumroot;
#if !defined NDEBUG #if !defined NDEBUG
cell glbdecl=0; cell glbdecl=0;
#endif #endif
@ -3174,8 +3172,6 @@ static void parse_old_array_dims(declinfo_t *decl, int flags)
stgset(FALSE); stgset(FALSE);
} else { } else {
do { do {
cell size;
if (type->numdim == sDIMEN_MAX) { if (type->numdim == sDIMEN_MAX) {
error(53); error(53);
return; return;
@ -3253,7 +3249,7 @@ static int parse_old_decl(declinfo_t *decl, int flags)
strcpy(decl->name, "__unknown__"); strcpy(decl->name, "__unknown__");
} else { } else {
if (!lexpeek(tSYMBOL)) { if (!lexpeek(tSYMBOL)) {
extern char *sc_tokens[]; extern const char *sc_tokens[];
switch (lextok(&tok)) { switch (lextok(&tok)) {
case tOBJECT: case tOBJECT:
case tCHAR: case tCHAR:
@ -3376,7 +3372,6 @@ static int reparse_new_decl(declinfo_t *decl, int flags)
// //
int parse_decl(declinfo_t *decl, int flags) int parse_decl(declinfo_t *decl, int flags)
{ {
token_t tok;
token_ident_t ident; token_ident_t ident;
memset(decl, 0, sizeof(*decl)); memset(decl, 0, sizeof(*decl));
@ -5050,7 +5045,7 @@ static symbol *funcstub(int tokid, declinfo_t *decl, const int *thistag)
int tok; int tok;
char *str; char *str;
cell val,size; cell val,size;
symbol *sym,*sub; symbol *sym;
int fnative = (tokid == tNATIVE || tokid == tMETHODMAP); int fnative = (tokid == tNATIVE || tokid == tMETHODMAP);
int fpublic = (tokid == tPUBLIC); int fpublic = (tokid == tPUBLIC);
@ -5158,7 +5153,6 @@ static int newfunc(declinfo_t *decl, const int *thistag, int fpublic, int fstati
char *str; char *str;
cell val,cidx,glbdecl; cell val,cidx,glbdecl;
short filenum; short filenum;
int state_id;
assert(litidx==0); /* literal queue should be empty */ assert(litidx==0); /* literal queue should be empty */
litidx=0; /* clear the literal pool (should already be empty) */ litidx=0; /* clear the literal pool (should already be empty) */
@ -5429,10 +5423,9 @@ static int declargs(symbol *sym, int chkshadow, const int *thistag)
{ {
char *ptr; char *ptr;
int argcnt,oldargcnt,tok; int argcnt,oldargcnt,tok;
cell val;
arginfo arg, *arglist; arginfo arg, *arglist;
char name[sNAMEMAX+1]; char name[sNAMEMAX+1];
int ident,fpublic; int fpublic;
int idx; int idx;
/* if the function is already defined earlier, get the number of arguments /* if the function is already defined earlier, get the number of arguments
@ -5618,7 +5611,6 @@ static int declargs(symbol *sym, int chkshadow, const int *thistag)
static void doarg(declinfo_t *decl, int offset, int fpublic, int chkshadow, arginfo *arg) static void doarg(declinfo_t *decl, int offset, int fpublic, int chkshadow, arginfo *arg)
{ {
symbol *argsym; symbol *argsym;
constvalue *enumroot;
int slength=0; int slength=0;
typeinfo_t *type = &decl->type; typeinfo_t *type = &decl->type;

10
sourcepawn/compiler/sc2.cpp
View File

@ -672,11 +672,11 @@ static int ftoi(cell *val,const unsigned char *curptr)
exp=(exp*10)+(*ptr-'0'); exp=(exp*10)+(*ptr-'0');
ptr++; ptr++;
} /* while */ } /* while */
#if defined __GNUC__ #if defined __GNUC__
fmult=pow10(exp*sign); fmult=pow10(exp*sign);
#else #else
fmult=pow(10,exp*sign); fmult=pow(10.0,exp*sign);
#endif #endif
fnum *= fmult; fnum *= fmult;
dnum *= (unsigned long)(fmult+0.5); dnum *= (unsigned long)(fmult+0.5);
} /* if */ } /* if */