Fixing preproc switches so that the 1.0 branch still builds against 0.1 without the switch flags