combine #IFDEFs and fix little ident mistakes
Merge pull request #1582 from ZhengyangL/feature/mldatafile

combine #ifdefs / fix little indent mistakes