Restore part of Patrick Spendrin's patch, fixing the problem.
We keep our structure, since internal defines don't belong in the
public header.  Also, our structure scales to other platforms and
does not rely on magic symbols defined by the compiler.

--HG--
branch : HEAD
2 files changed