summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiovanni Campagna <gcampagna@src.gnome.org>2011-03-01 22:33:20 +0100
committerGiovanni Campagna <gcampagna@src.gnome.org>2011-08-26 13:58:35 +0200
commit3553cd0a4631f1b57fb608e3f3f78a1a0cfd602a (patch)
tree77983c3922871235f14498ce20d3cb32530870bf
parent2fb64f36e4bcdde28f709ba68d46c8783a96cd94 (diff)
downloadgobject-introspection-3553cd0a4631f1b57fb608e3f3f78a1a0cfd602a.tar.gz
xlib: fix the type of XID
XIDs are CARD32, which corresponds to guint32 on all platform, not gulong (which is 64 bit on x86_64). Fix that, and use alias indirection to more accurately reflect the typedefs. https://bugzilla.gnome.org/show_bug.cgi?id=643620
-rw-r--r--gir/xlib-2.0.gir32
1 files changed, 14 insertions, 18 deletions
diff --git a/gir/xlib-2.0.gir b/gir/xlib-2.0.gir
index eaaba022..b4c8b47b 100644
--- a/gir/xlib-2.0.gir
+++ b/gir/xlib-2.0.gir
@@ -6,48 +6,44 @@
c:identifier-prefixes=""
c:symbol-prefixes="X">
<alias name="Atom" c:type="Atom">
- <type name="gulong" c:type="gulong"/>
+ <type name="ID" c:type="XID"/>
</alias>
<alias name="Colormap" c:type="Colormap">
- <type name="gulong" c:type="gulong"/>
+ <type name="ID" c:type="XID"/>
</alias>
<alias name="Cursor" c:type="Cursor">
- <type name="gulong" c:type="gulong"/>
+ <type name="ID" c:type="XID"/>
</alias>
<record name="Display" c:type="Display"/>
<alias name="Drawable" c:type="Drawable">
- <type name="gulong" c:type="gulong"/>
- </alias>
- <alias name="GC" c:type="GC">
- <type name="gpointer" c:type="gpointer"/>
+ <type name="ID" c:type="XID"/>
</alias>
+ <record name="GC" c:type="GC"/>
<alias name="KeyCode" c:type="KeyCode">
- <type name="guint8" c:type="guint8"/>
+ <type name="guchar" c:type="unsigned char"/>
</alias>
<alias name="KeySym" c:type="KeySym">
- <type name="gulong" c:type="gulong"/>
- </alias>
- <alias name="Picture" c:type="Picture">
- <type name="gulong" c:type="gulong"/>
+ <type name="ID" c:type="XID"/>
</alias>
+ <record name="Picture" c:type="Picture"/>
<record name="Screen" c:type="Screen"/>
<alias name="Time" c:type="Time">
- <type name="gulong" c:type="gulong"/>
+ <type name="guint32" c:type="CARD32"/>
</alias>
<record name="Visual" c:type="Visual"/>
<alias name="VisualID" c:type="VisualID">
- <type name="gulong" c:type="gulong"/>
+ <type name="ID" c:type="XID"/>
</alias>
<alias name="Window" c:type="Window">
- <type name="gulong" c:type="gulong"/>
+ <type name="ID" c:type="XID"/>
</alias>
<union name="XEvent" c:type="XEvent"/>
<record name="XConfigureEvent" c:type="XConfigureEvent"/>
- <alias name="XID" c:type="XID">
- <type name="gulong" c:type="gulong"/>
+ <alias name="ID" c:type="XID">
+ <type name="guint32" c:type="CARD32"/>
</alias>
<alias name="Pixmap" c:type="Pixmap">
- <type name="gulong" c:type="gulong"/>
+ <type name="ID" c:type="XID"/>
</alias>
<record name="XImage" c:type="XImage"/>
<record name="XFontStruct" c:type="XFontStruct"/>