Bug 891588 - Fix preprocessor warnings. r=fabrice