Index: tests/gimarshallingtests.c
===================================================================
--- tests/gimarshallingtests.c.orig	2011-04-21 13:36:13.000000000 +0000
+++ tests/gimarshallingtests.c	2011-11-16 03:52:04.574641404 +0000
@@ -91,57 +91,57 @@
 }
 
 void
-gi_marshalling_tests_int8_in_max (gint8 int8)
+gi_marshalling_tests_int8_in_max (gint8 int8_)
 {
-    g_assert(int8 == G_MAXINT8);
+    g_assert(int8_ == G_MAXINT8);
 }
 
 void
-gi_marshalling_tests_int8_in_min (gint8 int8)
+gi_marshalling_tests_int8_in_min (gint8 int8_)
 {
-    g_assert(int8 == G_MININT8);
+    g_assert(int8_ == G_MININT8);
 }
 
 /**
  * gi_marshalling_tests_int8_out_max:
- * @int8: (out):
+ * @int8_: (out):
  */
 void
-gi_marshalling_tests_int8_out_max (gint8 *int8)
+gi_marshalling_tests_int8_out_max (gint8 *int8_)
 {
-    *int8 = G_MAXINT8;
+    *int8_ = G_MAXINT8;
 }
 
 /**
  * gi_marshalling_tests_int8_out_min:
- * @int8: (out):
+ * @int8_: (out):
  */
 void
-gi_marshalling_tests_int8_out_min (gint8 *int8)
+gi_marshalling_tests_int8_out_min (gint8 *int8_)
 {
-    *int8 = G_MININT8;
+    *int8_ = G_MININT8;
 }
 
 /**
  * gi_marshalling_tests_int8_inout_max_min:
- * @int8: (inout):
+ * @int8_: (inout):
  */
 void
-gi_marshalling_tests_int8_inout_max_min (gint8 *int8)
+gi_marshalling_tests_int8_inout_max_min (gint8 *int8_)
 {
-    g_assert(*int8 == G_MAXINT8);
-    *int8 = G_MININT8;
+    g_assert(*int8_ == G_MAXINT8);
+    *int8_ = G_MININT8;
 }
 
 /**
  * gi_marshalling_tests_int8_inout_min_max:
- * @int8: (inout):
+ * @int8:_ (inout):
  */
 void
-gi_marshalling_tests_int8_inout_min_max (gint8 *int8)
+gi_marshalling_tests_int8_inout_min_max (gint8 *int8_)
 {
-    g_assert(*int8 == G_MININT8);
-    *int8 = G_MAXINT8;
+    g_assert(*int8_ == G_MININT8);
+    *int8_ = G_MAXINT8;
 }
 
 
@@ -192,57 +192,57 @@
 }
 
 void
-gi_marshalling_tests_int16_in_max (gint16 int16)
+gi_marshalling_tests_int16_in_max (gint16 int16_)
 {
-    g_assert(int16 == G_MAXINT16);
+    g_assert(int16_ == G_MAXINT16);
 }
 
 void
-gi_marshalling_tests_int16_in_min (gint16 int16)
+gi_marshalling_tests_int16_in_min (gint16 int16_)
 {
-    g_assert(int16 == G_MININT16);
+    g_assert(int16_ == G_MININT16);
 }
 
 /**
  * gi_marshalling_tests_int16_out_max:
- * @int16: (out):
+ * @int16_: (out):
  */
 void
-gi_marshalling_tests_int16_out_max (gint16 *int16)
+gi_marshalling_tests_int16_out_max (gint16 *int16_)
 {
-    *int16 = G_MAXINT16;
+    *int16_ = G_MAXINT16;
 }
 
 /**
  * gi_marshalling_tests_int16_out_min:
- * @int16: (out):
+ * @int16_: (out):
  */
 void
-gi_marshalling_tests_int16_out_min (gint16 *int16)
+gi_marshalling_tests_int16_out_min (gint16 *int16_)
 {
-    *int16 = G_MININT16;
+    *int16_ = G_MININT16;
 }
 
 /**
  * gi_marshalling_tests_int16_inout_max_min:
- * @int16: (inout):
+ * @int16_: (inout):
  */
 void
-gi_marshalling_tests_int16_inout_max_min (gint16 *int16)
+gi_marshalling_tests_int16_inout_max_min (gint16 *int16_)
 {
-    g_assert(*int16 == G_MAXINT16);
-    *int16 = G_MININT16;
+    g_assert(*int16_ == G_MAXINT16);
+    *int16_ = G_MININT16;
 }
 
 /**
  * gi_marshalling_tests_int16_inout_min_max:
- * @int16: (inout):
+ * @int16_: (inout):
  */
 void
-gi_marshalling_tests_int16_inout_min_max (gint16 *int16)
+gi_marshalling_tests_int16_inout_min_max (gint16 *int16_)
 {
-    g_assert(*int16 == G_MININT16);
-    *int16 = G_MAXINT16;
+    g_assert(*int16_ == G_MININT16);
+    *int16_ = G_MAXINT16;
 }
 
 
@@ -293,57 +293,57 @@
 }
 
 void
-gi_marshalling_tests_int32_in_max (gint32 int32)
+gi_marshalling_tests_int32_in_max (gint32 int32_)
 {
-    g_assert(int32 == G_MAXINT32);
+    g_assert(int32_ == G_MAXINT32);
 }
 
 void
-gi_marshalling_tests_int32_in_min (gint32 int32)
+gi_marshalling_tests_int32_in_min (gint32 int32_)
 {
-    g_assert(int32 == G_MININT32);
+    g_assert(int32_ == G_MININT32);
 }
 
 /**
  * gi_marshalling_tests_int32_out_max:
- * @int32: (out):
+ * @int32_: (out):
  */
 void
-gi_marshalling_tests_int32_out_max (gint32 *int32)
+gi_marshalling_tests_int32_out_max (gint32 *int32_)
 {
-    *int32 = G_MAXINT32;
+    *int32_ = G_MAXINT32;
 }
 
 /**
  * gi_marshalling_tests_int32_out_min:
- * @int32: (out):
+ * @int32_: (out):
  */
 void
-gi_marshalling_tests_int32_out_min (gint32 *int32)
+gi_marshalling_tests_int32_out_min (gint32 *int32_)
 {
-    *int32 = G_MININT32;
+    *int32_ = G_MININT32;
 }
 
 /**
  * gi_marshalling_tests_int32_inout_max_min:
- * @int32: (inout):
+ * @int32_: (inout):
  */
 void
-gi_marshalling_tests_int32_inout_max_min (gint32 *int32)
+gi_marshalling_tests_int32_inout_max_min (gint32 *int32_)
 {
-    g_assert(*int32 == G_MAXINT32);
-    *int32 = G_MININT32;
+    g_assert(*int32_ == G_MAXINT32);
+    *int32_ = G_MININT32;
 }
 
 /**
  * gi_marshalling_tests_int32_inout_min_max:
- * @int32: (inout):
+ * @int32_: (inout):
  */
 void
-gi_marshalling_tests_int32_inout_min_max (gint32 *int32)
+gi_marshalling_tests_int32_inout_min_max (gint32 *int32_)
 {
-    g_assert(*int32 == G_MININT32);
-    *int32 = G_MAXINT32;
+    g_assert(*int32_ == G_MININT32);
+    *int32_ = G_MAXINT32;
 }
 
 
@@ -394,57 +394,57 @@
 }
 
 void
-gi_marshalling_tests_int64_in_max (gint64 int64)
+gi_marshalling_tests_int64_in_max (gint64 int64_)
 {
-    g_assert(int64 == G_MAXINT64);
+    g_assert(int64_ == G_MAXINT64);
 }
 
 void
-gi_marshalling_tests_int64_in_min (gint64 int64)
+gi_marshalling_tests_int64_in_min (gint64 int64_)
 {
-    g_assert(int64 == G_MININT64);
+    g_assert(int64_ == G_MININT64);
 }
 
 /**
  * gi_marshalling_tests_int64_out_max:
- * @int64: (out):
+ * @int64_: (out):
  */
 void
-gi_marshalling_tests_int64_out_max (gint64 *int64)
+gi_marshalling_tests_int64_out_max (gint64 *int64_)
 {
-    *int64 = G_MAXINT64;
+    *int64_ = G_MAXINT64;
 }
 
 /**
  * gi_marshalling_tests_int64_out_min:
- * @int64: (out):
+ * @int64_: (out):
  */
 void
-gi_marshalling_tests_int64_out_min (gint64 *int64)
+gi_marshalling_tests_int64_out_min (gint64 *int64_)
 {
-    *int64 = G_MININT64;
+    *int64_ = G_MININT64;
 }
 
 /**
  * gi_marshalling_tests_int64_inout_max_min:
- * @int64: (inout):
+ * @int64_: (inout):
  */
 void
-gi_marshalling_tests_int64_inout_max_min (gint64 *int64)
+gi_marshalling_tests_int64_inout_max_min (gint64 *int64_)
 {
-    g_assert(*int64 == G_MAXINT64);
-    *int64 = G_MININT64;
+    g_assert(*int64_ == G_MAXINT64);
+    *int64_ = G_MININT64;
 }
 
 /**
  * gi_marshalling_tests_int64_inout_min_max:
- * @int64: (inout):
+ * @int64_: (inout):
  */
 void
-gi_marshalling_tests_int64_inout_min_max (gint64 *int64)
+gi_marshalling_tests_int64_inout_min_max (gint64 *int64_)
 {
-    g_assert(*int64 == G_MININT64);
-    *int64 = G_MAXINT64;
+    g_assert(*int64_ == G_MININT64);
+    *int64_ = G_MAXINT64;
 }
 
 
@@ -1170,10 +1170,10 @@
         values = g_new(GIMarshallingTestsSimpleStruct, 2);
 
         values[0].long_ = 7;
-        values[0].int8 = 6;
+        values[0].int8_ = 6;
 
         values[1].long_ = 6;
-        values[1].int8 = 7;
+        values[1].int8_ = 7;
     }
 
     *structs = values;
@@ -2656,7 +2656,7 @@
         struct_ = g_new(GIMarshallingTestsSimpleStruct, 1);
 
         struct_->long_ = 6;
-        struct_->int8 = 7;
+        struct_->int8_ = 7;
     }
 
     return struct_;
@@ -2670,14 +2670,14 @@
 gi_marshalling_tests_simple_struct_inv (GIMarshallingTestsSimpleStruct *struct_)
 {
     g_assert(struct_->long_ == 6);
-    g_assert(struct_->int8 == 7);
+    g_assert(struct_->int8_ == 7);
 }
 
 void
 gi_marshalling_tests_simple_struct_method (GIMarshallingTestsSimpleStruct *struct_)
 {
     g_assert(struct_->long_ == 6);
-    g_assert(struct_->int8 == 7);
+    g_assert(struct_->int8_ == 7);
 }
 
 
Index: tests/gimarshallingtests.h
===================================================================
--- tests/gimarshallingtests.h.orig	2011-04-21 13:36:13.000000000 +0000
+++ tests/gimarshallingtests.h	2011-11-16 03:50:10.611538367 +0000
@@ -35,14 +35,14 @@
 gint8 gi_marshalling_tests_int8_return_max (void);
 gint8 gi_marshalling_tests_int8_return_min (void);
 
-void gi_marshalling_tests_int8_in_max (gint8 int8);
-void gi_marshalling_tests_int8_in_min (gint8 int8);
+void gi_marshalling_tests_int8_in_max (gint8 int8_);
+void gi_marshalling_tests_int8_in_min (gint8 int8_);
 
-void gi_marshalling_tests_int8_out_max (gint8 *int8);
-void gi_marshalling_tests_int8_out_min (gint8 *int8);
+void gi_marshalling_tests_int8_out_max (gint8 *int8_);
+void gi_marshalling_tests_int8_out_min (gint8 *int8_);
 
-void gi_marshalling_tests_int8_inout_max_min (gint8 *int8);
-void gi_marshalling_tests_int8_inout_min_max (gint8 *int8);
+void gi_marshalling_tests_int8_inout_max_min (gint8 *int8_);
+void gi_marshalling_tests_int8_inout_min_max (gint8 *int8_);
 
 
 guint8 gi_marshalling_tests_uint8_return (void);
@@ -56,14 +56,14 @@
 gint16 gi_marshalling_tests_int16_return_max (void);
 gint16 gi_marshalling_tests_int16_return_min (void);
 
-void gi_marshalling_tests_int16_in_max (gint16 int16);
-void gi_marshalling_tests_int16_in_min (gint16 int16);
+void gi_marshalling_tests_int16_in_max (gint16 int16_);
+void gi_marshalling_tests_int16_in_min (gint16 int16_);
 
-void gi_marshalling_tests_int16_out_max (gint16 *int16);
-void gi_marshalling_tests_int16_out_min (gint16 *int16);
+void gi_marshalling_tests_int16_out_max (gint16 *int16_);
+void gi_marshalling_tests_int16_out_min (gint16 *int16_);
 
-void gi_marshalling_tests_int16_inout_max_min (gint16 *int16);
-void gi_marshalling_tests_int16_inout_min_max (gint16 *int16);
+void gi_marshalling_tests_int16_inout_max_min (gint16 *int16_);
+void gi_marshalling_tests_int16_inout_min_max (gint16 *int16_);
 
 
 guint16 gi_marshalling_tests_uint16_return (void);
@@ -77,14 +77,14 @@
 gint32 gi_marshalling_tests_int32_return_max (void);
 gint32 gi_marshalling_tests_int32_return_min (void);
 
-void gi_marshalling_tests_int32_in_max (gint32 int32);
-void gi_marshalling_tests_int32_in_min (gint32 int32);
+void gi_marshalling_tests_int32_in_max (gint32 int32_);
+void gi_marshalling_tests_int32_in_min (gint32 int32_);
 
-void gi_marshalling_tests_int32_out_max (gint32 *int32);
-void gi_marshalling_tests_int32_out_min (gint32 *int32);
+void gi_marshalling_tests_int32_out_max (gint32 *int32_);
+void gi_marshalling_tests_int32_out_min (gint32 *int32_);
 
-void gi_marshalling_tests_int32_inout_max_min (gint32 *int32);
-void gi_marshalling_tests_int32_inout_min_max (gint32 *int32);
+void gi_marshalling_tests_int32_inout_max_min (gint32 *int32_);
+void gi_marshalling_tests_int32_inout_min_max (gint32 *int32_);
 
 
 guint32 gi_marshalling_tests_uint32_return (void);
@@ -98,14 +98,14 @@
 gint64 gi_marshalling_tests_int64_return_max (void);
 gint64 gi_marshalling_tests_int64_return_min (void);
 
-void gi_marshalling_tests_int64_in_max (gint64 int64);
-void gi_marshalling_tests_int64_in_min (gint64 int64);
+void gi_marshalling_tests_int64_in_max (gint64 int64_);
+void gi_marshalling_tests_int64_in_min (gint64 int64_);
 
-void gi_marshalling_tests_int64_out_max (gint64 *int64);
-void gi_marshalling_tests_int64_out_min (gint64 *int64);
+void gi_marshalling_tests_int64_out_max (gint64 *int64_);
+void gi_marshalling_tests_int64_out_min (gint64 *int64_);
 
-void gi_marshalling_tests_int64_inout_max_min (gint64 *int64);
-void gi_marshalling_tests_int64_inout_min_max (gint64 *int64);
+void gi_marshalling_tests_int64_inout_max_min (gint64 *int64_);
+void gi_marshalling_tests_int64_inout_min_max (gint64 *int64_);
 
 
 guint64 gi_marshalling_tests_uint64_return (void);
@@ -511,7 +511,7 @@
 
 struct _GIMarshallingTestsSimpleStruct {
     glong long_;
-    gint8 int8;
+    gint8 int8_;
 };
 
 typedef struct {
