diff --git a/operandBody_6502.h b/operandBody_6502.h index 952adcd..e0ab9f7 100644 --- a/operandBody_6502.h +++ b/operandBody_6502.h @@ -57,10 +57,6 @@ typedef selectionListType ySelectedOperandBodyType; typedef selectionListType preSelectedOperandBodyType; -#define BlockOperandBodyType anyOldThing /* kludge */ -/* doing above right confuses compiler as it is a forward reference inside - yon union: */ - typedef union { expressionOperandBodyType *expressionUnion; immediateOperandBodyType *immediateUnion; @@ -76,5 +72,5 @@ typedef union { ySelectedOperandBodyType *ySelectedUnion; preSelectedOperandBodyType *preSelectedUnion; stringOperandBodyType *stringUnion; - BlockOperandBodyType *blockUnion; + blockOperandBodyType *blockUnion; } operandBodyType; diff --git a/operandBody_68000.h b/operandBody_68000.h index aaea76c..4d99ad1 100644 --- a/operandBody_68000.h +++ b/operandBody_68000.h @@ -69,14 +69,10 @@ typedef nullType uspRegisterOperandBodyType; typedef nullType controlRegisterOperandBodyType; -#define BlockOperandBodyType anyOldThing /* kludge */ -/* doing above right confuses compiler as it is a forward reference inside - yon union: */ - typedef union { expressionOperandBodyType *expressionUnion; stringOperandBodyType *stringUnion; - BlockOperandBodyType *blockUnion; + blockOperandBodyType *blockUnion; dRegisterOperandBodyType *dRegisterUnion; aRegisterOperandBodyType *aRegisterUnion; aRegisterIndirectOperandBodyType *aRegisterIndirectUnion; diff --git a/operandStuffSD_6502.c b/operandStuffSD_6502.c index bb4b811..c085d11 100644 --- a/operandStuffSD_6502.c +++ b/operandStuffSD_6502.c @@ -125,7 +125,7 @@ buildOperand(operandKindType kindOfOperand, anyOldThing *arg) break; case BLOCK_OPND: - result->theOperand.blockUnion = (BlockOperandBodyType *) arg; + result->theOperand.blockUnion = (blockOperandBodyType *) arg; break; default: diff --git a/operandStuffSD_68000.c b/operandStuffSD_68000.c index 7d51fd0..689ac8d 100644 --- a/operandStuffSD_68000.c +++ b/operandStuffSD_68000.c @@ -59,7 +59,7 @@ buildOperand(kindOfOperand, arg1, arg2, arg3, arg4) break; case BLOCK_OPND: - result->theOperand.blockUnion = (BlockOperandBodyType *) arg1; + result->theOperand.blockUnion = (blockOperandBodyType *) arg1; break; case D_REGISTER_OPND: