Make it compile cleanly on x86.

(Logical change 1.32)
3 files changed