* expr.h (emit_conditional_add): Add PARAMS to declaration.
	* gengtype-lex.l (malloc, realloc): Move defines after include of
	system.h.  Remove duplicate include of system.h.

From-SVN: r61336