chiark / gitweb /
Fixes to r8997: firstly, move the fix out of #ifdef CAIRO so that it