Apply an MSVC compilation fix from Gisle Vanem

This fixes a double-define introduced in 28538069b2f1909a7600ec6d
Merge remote-tracking branch 'origin/maint-0.2.5'