Compilation reportedly fails on icc, conflicting macro definitions (both __i686__ and __x86_64__ defined) is under suspicion. This patch tentatively fixes the issue. Reported-by: Tim Blechmann <tim@klingt.org> [SVN r79617]