On 13.12.2012, at 16:30, Gerd Hoffmann wrote: > Hi, > >> 6e72719e721a40fe1224701ca10edc1caf0cd708 > > It's broken, version is wrong, and I told you. > Seems you sneaked it in nevertheless.
It's consistent now with the #ifdef 5 lines above the line that the patch does. > >> You had 2 branches that were using a new flag, one of which you had >> an #ifdef around and one of which you didn't. This is all fixed for >> quite a while now :). > > Can you check which of your pixman versions have PIXMAN_TYPE_BGRA? > > 0.18.4 has it > 0.12.0 has not > > The 0.16.x versions would be interesting so we can fix the #ifdef to be > correct (or at least correct enougth for all practical purposes). 0.16.0 does. > >> If that's the culprit for all this mess, can we remove the configure >> check again? QEMU compiles just fine without it today on pixman >> 0.12.0. > > If you send me a fix for 6e72719e721a40fe1224701ca10edc1caf0cd708 I'll > go revert 288fa40736e6eb63132d01aa6dc21ee831b796ae 6e72719 is perfectly sane, because it brings consistency into the file. Now both users of PIXMAN_TYPE_BGRA are guarded by the same #ifdef. I do agree though that instead of #if SOME_MAGIC_VERSION we rather either do #ifdef PIXMAN_TYPE_BGRA or no #ifdef at all and a proper configure check. Having a configure check and the #ifdef is wrong. Doing #ifdef MAGIC_VERSION is also wrong. So a quick fix would be to bump the configure check to 0.16.0 and remove the two #ifdefs in qemu-pixman.c. Alex
