[Gtk2hs-commit] (main branch): fixes for gtk-2.12 on Windows

[Daniel W. <dm...@lu...>]

diffing dir...
Thu Mar  8 10:13:11 GMT 2012  Daniel Wagner <da...@wa...>
  * fixes for gtk-2.12 on Windows
  Ignore-this: 5c66fd3081d3f6cdadde33ddfad2a70
    hunk ./cairo/Graphics/Rendering/Cairo.hs 8
    -#include<cairo-version.h>
    hunk ./cairo/Graphics/Rendering/Cairo.hs 9
    +
    +-- GTK-2.12 doesn't have cairo-version.h, but defines the appropriate VERSION
    +-- variables in cairo-features.h instead. So only include this when necessary.
    +#ifndef CAIRO_VERSION_MAJOR
    +#include<cairo-version.h>
    +#endif
    hunk ./gio/System/GIO/Icons/ThemedIcon.chs 42
    +#if GLIB_CHECK_VERSION(2,18,0)
    hunk ./gio/System/GIO/Icons/ThemedIcon.chs 44
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 122
    +#if !defined(WIN32) || GTK_CHECK_VERSION(2,14,0)
    +#else
    +import Unsafe.Coerce
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 612
    +#if GTK_CHECK_VERSION(2,14,0)
    +#else
    +     -- GTK-2.12 is a bit sloppy about the distinction between pointers and
    +     -- 32-bit ints, so we have to mimic that sloppiness here
    +     liftM unsafeCoerce $
    +#endif