Modified ifdefs
Merge branch 'master' of https://github.com/jdgregson/poker