Fix compile error in the heterogeneous case.

We've been forcing C99 compiler compliance for a while now, so use C99
syntax to keep the #if code tidy.