[GIMarshalingTests] Add underscores to more variable names

These may conflict.

https://bugzilla.gnome.org/show_bug.cgi?id=624191

3 files changed, 45 insertions, 45 deletions

diff --git a/gir/GIMarshallingTests-1.0-expected.gir b/gir/GIMarshallingTests-1.0-expected.gir
index 164f7f14..80461da3 100644
--- a/gir/GIMarshallingTests-1.0-expected.gir
+++ b/gir/GIMarshallingTests-1.0-expected.gir
@@ -3305,7 +3305,7 @@ and/or use gtk-doc annotations.  -->
         <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>
@@ -3316,7 +3316,7 @@ and/or use gtk-doc annotations.  -->
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="uint"
+        <parameter name="uint_"
                    direction="inout"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3329,7 +3329,7 @@ and/or use gtk-doc annotations.  -->
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="uint"
+        <parameter name="uint_"
                    direction="out"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3348,7 +3348,7 @@ and/or use gtk-doc annotations.  -->
         <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>
@@ -3359,7 +3359,7 @@ and/or use gtk-doc annotations.  -->
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ulong"
+        <parameter name="ulong_"
                    direction="inout"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3372,7 +3372,7 @@ and/or use gtk-doc annotations.  -->
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ulong"
+        <parameter name="ulong_"
                    direction="out"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3434,7 +3434,7 @@ and/or use gtk-doc annotations.  -->
         <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>
@@ -3445,7 +3445,7 @@ and/or use gtk-doc annotations.  -->
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ushort"
+        <parameter name="ushort_"
                    direction="inout"
                    caller-allocates="0"
                    transfer-ownership="full">
@@ -3459,7 +3459,7 @@ and/or use gtk-doc annotations.  -->
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ushort"
+        <parameter name="ushort_"
                    direction="out"
                    caller-allocates="0"
                    transfer-ownership="full">
diff --git a/gir/gimarshallingtests.c b/gir/gimarshallingtests.c
index f5f1a8c7..2c47c216 100644
--- a/gir/gimarshallingtests.c
+++ b/gir/gimarshallingtests.c
@@ -556,30 +556,30 @@ g_i_marshalling_tests_ushort_return (void)
 }
 
 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 @@ g_i_marshalling_tests_uint_return (void)
 }
 
 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;
 }
 
 
@@ -758,30 +758,30 @@ g_i_marshalling_tests_ulong_return (void)
 }
 
 void
-g_i_marshalling_tests_ulong_in (gulong ulong)
+g_i_marshalling_tests_ulong_in (gulong ulong_)
 {
-    g_assert(ulong == G_MAXULONG);
+    g_assert(ulong_ == G_MAXULONG);
 }
 
 /**
  * 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 --git a/gir/gimarshallingtests.h b/gir/gimarshallingtests.h
index 34ae0bb4..467590c1 100644
--- a/gir/gimarshallingtests.h
+++ b/gir/gimarshallingtests.h
@@ -131,10 +131,10 @@ void g_i_marshalling_tests_short_inout_min_max (gshort *short_);
 
 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 @@ void g_i_marshalling_tests_int_inout_min_max (gint *int_);
 
 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 @@ void g_i_marshalling_tests_long_inout_min_max (glong *long_);
 
 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);