using __APPLE__ && __MACH__ instead of _MACOSX
Authored by: matzon 2006-11-18
Parent: [r2651]
Child: [r2653]