diff -Nur -x '*.orig' -x '*~' gobject-introspection-0.6.14//gir/GIMarshallingTests-1.0-expected.gir gobject-introspection-0.6.14.new//gir/GIMarshallingTests-1.0-expected.gir
--- gobject-introspection-0.6.14//gir/GIMarshallingTests-1.0-expected.gir	2010-06-03 18:59:04.000000000 +0000
+++ gobject-introspection-0.6.14.new//gir/GIMarshallingTests-1.0-expected.gir	2010-06-23 23:24:02.000000000 +0000
@@ -3278,7 +3278,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="uint" transfer-ownership="none">
+        <parameter name="uint_" transfer-ownership="none">
           <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
@@ -3289,7 +3289,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="uint"
+        <parameter name="uint_"
                    direction="inout"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3302,7 +3302,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="uint"
+        <parameter name="uint_"
                    direction="out"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3321,7 +3321,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ulong" transfer-ownership="none">
+        <parameter name="ulong_" transfer-ownership="none">
           <type name="ulong" c:type="gulong"/>
         </parameter>
       </parameters>
@@ -3332,7 +3332,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ulong"
+        <parameter name="ulong_"
                    direction="inout"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3345,7 +3345,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ulong"
+        <parameter name="ulong_"
                    direction="out"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3407,7 +3407,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ushort" transfer-ownership="none">
+        <parameter name="ushort_" transfer-ownership="none">
           <type name="ushort" c:type="gushort"/>
         </parameter>
       </parameters>
@@ -3418,7 +3418,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ushort"
+        <parameter name="ushort_"
                    direction="inout"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3432,7 +3432,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ushort"
+        <parameter name="ushort_"
                    direction="out"
                    caller-allocates="0"
                    transfer-ownership="full">
diff -Nur -x '*.orig' -x '*~' gobject-introspection-0.6.14//gir/gimarshallingtests.c gobject-introspection-0.6.14.new//gir/gimarshallingtests.c
--- gobject-introspection-0.6.14//gir/gimarshallingtests.c	2010-06-03 18:59:04.000000000 +0000
+++ gobject-introspection-0.6.14.new//gir/gimarshallingtests.c	2010-06-23 23:24:02.000000000 +0000
@@ -556,30 +556,30 @@
 }
 
 void
-g_i_marshalling_tests_ushort_in (gushort ushort)
+g_i_marshalling_tests_ushort_in (gushort ushort_)
 {
-    g_assert(ushort == G_MAXUSHORT);
+    g_assert(ushort_ == G_MAXUSHORT);
 }
 
 /**
  * g_i_marshalling_tests_ushort_out:
- * ushort: (out):
+ * ushort_: (out):
  */
 void
-g_i_marshalling_tests_ushort_out (gushort *ushort)
+g_i_marshalling_tests_ushort_out (gushort *ushort_)
 {
-    *ushort = G_MAXUSHORT;
+    *ushort_ = G_MAXUSHORT;
 }
 
 /**
  * g_i_marshalling_tests_ushort_inout:
- * ushort: (inout):
+ * ushort_: (inout):
  */
 void
-g_i_marshalling_tests_ushort_inout (gushort *ushort)
+g_i_marshalling_tests_ushort_inout (gushort *ushort_)
 {
-    g_assert(*ushort == G_MAXUSHORT);
-    *ushort = 0;
+    g_assert(*ushort_ == G_MAXUSHORT);
+    *ushort_ = 0;
 }
 
 
@@ -657,30 +657,30 @@
 }
 
 void
-g_i_marshalling_tests_uint_in (guint uint)
+g_i_marshalling_tests_uint_in (guint uint_)
 {
-    g_assert(uint == G_MAXUINT);
+    g_assert(uint_ == G_MAXUINT);
 }
 
 /**
  * g_i_marshalling_tests_uint_out:
- * uint: (out):
+ * uint_: (out):
  */
 void
-g_i_marshalling_tests_uint_out (guint *uint)
+g_i_marshalling_tests_uint_out (guint *uint_)
 {
-    *uint = G_MAXUINT;
+    *uint_ = G_MAXUINT;
 }
 
 /**
  * g_i_marshalling_tests_uint_inout:
- * uint: (inout):
+ * uint_: (inout):
  */
 void
-g_i_marshalling_tests_uint_inout (guint *uint)
+g_i_marshalling_tests_uint_inout (guint *uint_)
 {
-    g_assert(*uint == G_MAXUINT);
-    *uint = 0;
+    g_assert(*uint_ == G_MAXUINT);
+    *uint_ = 0;
 }
 
 
@@ -765,23 +765,23 @@
 
 /**
  * g_i_marshalling_tests_ulong_out:
- * ulong: (out):
+ * ulong_: (out):
  */
 void
-g_i_marshalling_tests_ulong_out (gulong *ulong)
+g_i_marshalling_tests_ulong_out (gulong *ulong_)
 {
-    *ulong = G_MAXULONG;
+    *ulong_ = G_MAXULONG;
 }
 
 /**
  * g_i_marshalling_tests_ulong_inout:
- * ulong: (inout):
+ * ulong_: (inout):
  */
 void
-g_i_marshalling_tests_ulong_inout (gulong *ulong)
+g_i_marshalling_tests_ulong_inout (gulong *ulong_)
 {
-    g_assert(*ulong == G_MAXULONG);
-    *ulong = 0;
+    g_assert(*ulong_ == G_MAXULONG);
+    *ulong_ = 0;
 }
 
 
diff -Nur -x '*.orig' -x '*~' gobject-introspection-0.6.14//gir/gimarshallingtests.h gobject-introspection-0.6.14.new//gir/gimarshallingtests.h
--- gobject-introspection-0.6.14//gir/gimarshallingtests.h	2010-06-03 18:59:04.000000000 +0000
+++ gobject-introspection-0.6.14.new//gir/gimarshallingtests.h	2010-06-23 23:24:02.000000000 +0000
@@ -131,10 +131,10 @@
 
 gushort g_i_marshalling_tests_ushort_return (void);
 
-void g_i_marshalling_tests_ushort_in (gushort ushort);
+void g_i_marshalling_tests_ushort_in (gushort ushort_);
 
-void g_i_marshalling_tests_ushort_out (gushort *ushort);
-void g_i_marshalling_tests_ushort_inout (gushort *ushort);
+void g_i_marshalling_tests_ushort_out (gushort *ushort_);
+void g_i_marshalling_tests_ushort_inout (gushort *ushort_);
 
 
 gint g_i_marshalling_tests_int_return_max (void);
@@ -152,10 +152,10 @@
 
 guint g_i_marshalling_tests_uint_return (void);
 
-void g_i_marshalling_tests_uint_in (guint uint);
+void g_i_marshalling_tests_uint_in (guint uint_);
 
-void g_i_marshalling_tests_uint_out (guint *uint);
-void g_i_marshalling_tests_uint_inout (guint *uint);
+void g_i_marshalling_tests_uint_out (guint *uint_);
+void g_i_marshalling_tests_uint_inout (guint *uint_);
 
 
 glong g_i_marshalling_tests_long_return_max (void);
@@ -173,10 +173,10 @@
 
 gulong g_i_marshalling_tests_ulong_return (void);
 
-void g_i_marshalling_tests_ulong_in (gulong ulong);
+void g_i_marshalling_tests_ulong_in (gulong ulong_);
 
-void g_i_marshalling_tests_ulong_out (gulong *ulong);
-void g_i_marshalling_tests_ulong_inout (gulong *ulong);
+void g_i_marshalling_tests_ulong_out (gulong *ulong_);
+void g_i_marshalling_tests_ulong_inout (gulong *ulong_);
 
 
 gssize g_i_marshalling_tests_ssize_return_max (void);
