Removed unnecessary #if statements and unified style to align with Xc…#3884

Merged

liuxuan30 merged 2 commits intomasterfrom cleanup-pound-if

Mar 7, 2019

+544-699

Commits on Mar 5, 2019

Removed unnecessary #if statements and unified style to align with Xcode's indentation
jjatie
committed

Commits on Mar 6, 2019

Merge branch 'master' into cleanup-pound-if
jjatie
authored