Have __APPLE2ENH__ imply __APPLE2__ and __ATARIXL__ imply __ATARI__.
Avoid macro redefinition of CH_DEL for apple2enh.

I'm wondering why MS VC++ didn't complain about this...
Merge remote-tracking branch 'upstream/master'