Commit 4796185
committed
Fix cpu.inc guard to check for actual CPU symbol
- Change guard from checking __CPU_INC_INCLUDED__ to CPU_ISET_NONE
- This properly detects if cpu.mac has already been included
- Fixes the 'Symbol already defined' errors for all apple2 targets
The issue was that .ifndef __CPU_INC_INCLUDED__ didn't prevent the
.macpack cpu from being executed multiple times, since the CPU symbols
are defined with = (assignment) not .define. Checking for CPU_ISET_NONE
(which is defined by cpu.mac) properly guards against multiple inclusion.1 parent 14b6f90 commit 4796185
1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
| 2 | + | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
0 commit comments