diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-07-02 13:02:12 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-07-02 11:09:36 +0000 |
| commit | 88302f267ce4862b81023004fdfbfaef99d5a3ae (patch) | |
| tree | c6165f958f9cd3f9885eb1c62325b1d3143a54d3 | |
| parent | 051986ccf82f048c351f00d2ec2d38caf70371f1 (diff) | |
| download | wireshark-88302f267ce4862b81023004fdfbfaef99d5a3ae.tar.gz | |
Try to fix OSX build boot
lemon.c:1784: warning: implicit conversion shortens 64-bit value into a 32-bit value
lemon.c:1790: warning: implicit conversion shortens 64-bit value into a 32-bit value
1790: warning: implicit conversion shortens 64-bit value into a 32-bit value
1928: warning: implicit conversion shortens 64-bit value into a 32-bit value
2707: warning: implicit conversion shortens 64-bit value into a 32-bit value
Change-Id: Ief1b64009891de6885c2c9a6cb0e290752de889f
Reviewed-on: https://code.wireshark.org/review/9463
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | tools/lemon/lemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index 6d14ac8640..70b62939f4 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -1781,13 +1781,13 @@ PRIVATE char *msort( list = NEXT(list); NEXT(ep) = 0; for(i=0; i<LISTSIZE-1 && set[i]!=0; i++){ - ep = merge(ep,set[i],cmp,offset); + ep = merge(ep,set[i],cmp,(int)offset); set[i] = 0; } set[i] = ep; } ep = 0; - for(i=0; i<LISTSIZE; i++) if( set[i] ) ep = merge(set[i],ep,cmp,offset); + for(i=0; i<LISTSIZE; i++) if( set[i] ) ep = merge(set[i],ep,cmp,(int)offset); return ep; } /************************ From the file "option.c" **************************/ @@ -1925,7 +1925,7 @@ static int handleswitch(int i, FILE *err) break; case OPT_INT: case OPT_FINT: - lv = strtol(cp,&end,0); + lv = (int)strtol(cp,&end,0); if( *end ){ if( err ){ fprintf(err,"%sillegal character in integer argument.\n",emsg); @@ -2684,7 +2684,7 @@ void Parse(struct lemon *gp) struct pstate ps; FILE *fp; char *filebuf; - unsigned int filesize; + unsigned long int filesize; int lineno; int c; char *cp, *nextcp; |