Commit 4311b6a7 authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Few minor compile fixes

(mostly warnings)
parent 473920ea
......@@ -6,6 +6,7 @@ CONSOLE_REL_TAR:=$(CURDIR)/console_$(shell date +%Y%m%d%H%M).tar.gz
all:
$(MAKE) -C common/utils
$(MAKE) -C common/trace
$(MAKE) -C common/log
$(MAKE) -C controller
cd libnova-0.13.0 ; ./configure -enable-static -disable-shared --prefix=${CURDIR} ; make; make install
$(MAKE) -C console
......
......@@ -157,5 +157,7 @@ int dt_model_params_set(struct dt_model_params *newparams)
int dt_model_params_get(struct dt_model_params *getparams)
{
memcpy(getparams, params, sizeof(struct dt_model_params));
return 0;
}
......@@ -226,7 +226,7 @@ doublevar: DOUBLEVARIABLESYM
| CONST_PI_SYM
{ $$ = M_PI; }
| MINSYM doublevar %prec UMINUS
{ $$ = - $2 }
{ $$ = - $2; }
;
......@@ -249,7 +249,7 @@ intvar: INTSYM
| BOOLCASTSYM intvar
{ $$ = $2; }
| MINSYM intvar %prec UMINUS
{ $$ = - $2 }
{ $$ = - $2; }
;
unsignedlongvar: UNSIGNEDLONGSYM
......@@ -257,9 +257,9 @@ unsignedlongvar: UNSIGNEDLONGSYM
;
set: SETSYM VARIABLENAMESYM doublevar
{ controller_load_variable_double_set($2, $3) }
{ controller_load_variable_double_set($2, $3); }
| SETSYM VARIABLENAMESYM stringvar
{ controller_load_variable_string_set($2, $3) }
{ controller_load_variable_string_set($2, $3); }
;
links : LINKSSYM BRACEOPENSYM linklist BRACECLOSESYM
......
......@@ -296,32 +296,32 @@ instr : LABEL
anyvar : VARIABLE
{
il2c_literal_type_set(0);
$$ = $1
$$ = $1;
}
| literal
{ $$ = $1 }
{ $$ = $1; }
;
mathfunc: SQRTSYM
{ $$ = "sqrt" }
{ $$ = "sqrt"; }
| LNSYM
{ $$ = "log" }
{ $$ = "log"; }
| LOGSYM
{ $$ = "log10" }
{ $$ = "log10"; }
| EXPSYM
{ $$ = "exp" }
{ $$ = "exp"; }
| SINSYM
{ $$ = "sin" }
{ $$ = "sin"; }
| COSSYM
{ $$ = "cos" }
{ $$ = "cos"; }
| TANSYM
{ $$ = "tan" }
{ $$ = "tan"; }
| ASINSYM
{ $$ = "asin" }
{ $$ = "asin"; }
| ACOSSYM
{ $$ = "acos" }
{ $$ = "acos"; }
| ATANSYM
{ $$ = "atan" }
{ $$ = "atan"; }
;
oplist : op
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment