added #ifdefs
Merge branch 'master' of github.com:nbeebe/sceadan