d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove #include <stdbool.h> from mach/powerpc/as/mach1.c

Browse source 
We should not include a system header file here, because
mach/proto/as/comm2.y goes through cpp twice.  The include can cause
problems like https://github.com/davidgiven/ack/issues/1

Remove this include #<stdbool.h> and leave a comment pointing to the
includes in comm0.h.  Change the few instances of bool, false, true,
to int, 0, 1.
This commit is contained in:
George Koehler 2017-01-30 16:39:23 -05:00
parent 3c1d2d79f0
commit f4cfbedd5c
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mach/powerpc/as/mach1.c
View file

@ -3,7 +3,9 @@
* $State$ * $State$
*/ */
#include <stdbool.h> /*
* Do not #include anything here. Do it in mach/proto/as/comm0.h
*/
extern word_t emit_hi(struct expr_t* expr, bool is_signed); extern word_t emit_hi(struct expr_t* expr, int is_signed);
extern word_t emit_lo(struct expr_t* expr); extern word_t emit_lo(struct expr_t* expr);

4
mach/powerpc/as/mach4.c
View file

@ -218,8 +218,8 @@ e16
serror("16-bit value out of range"); serror("16-bit value out of range");
$$ = (uint16_t) $1; $$ = (uint16_t) $1;
} }
| OP_HI ASC_LPAR expr ASC_RPAR { $$ = emit_hi(&$3, false); } | OP_HI ASC_LPAR expr ASC_RPAR { $$ = emit_hi(&$3, 0); }
| OP_HA ASC_LPAR expr ASC_RPAR { $$ = emit_hi(&$3, true); } | OP_HA ASC_LPAR expr ASC_RPAR { $$ = emit_hi(&$3, 1); }
| OP_LO ASC_LPAR expr ASC_RPAR { $$ = emit_lo(&$3); } | OP_LO ASC_LPAR expr ASC_RPAR { $$ = emit_lo(&$3); }
; ;

2
mach/powerpc/as/mach5.c
View file

@ -1,5 +1,5 @@
word_t emit_hi(struct expr_t* expr, bool is_signed) word_t emit_hi(struct expr_t* expr, int is_signed)
{ {
/* If this is a symbol reference, discard the symbol and keep only the /* If this is a symbol reference, discard the symbol and keep only the
* offset part. */ * offset part. */