summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2012-02-03 12:53:22 -0500
committerColin Walters <walters@verbum.org>2012-02-03 12:54:59 -0500
commit79dcd9cd97b36b92a8f0dd0b94f40055fddbf7d4 (patch)
treefceac22d5938f59068604f3066f47c6215da2fbd
parent3c0cfdc992caa5c19a7e2f0820dc5286a7e14dbb (diff)
downloadgobject-introspection-79dcd9cd97b36b92a8f0dd0b94f40055fddbf7d4.tar.gz
tests: Squash compile warning, fix C indentation
-rw-r--r--tests/gimarshallingtests.c4
-rw-r--r--tests/gimarshallingtests.h9
2 files changed, 6 insertions, 7 deletions
diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c
index 196b7394..66a6dad1 100644
--- a/tests/gimarshallingtests.c
+++ b/tests/gimarshallingtests.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
* vim: tabstop=4 shiftwidth=4 expandtab
*/
@@ -4178,7 +4178,7 @@ gi_marshalling_tests_gerror_out_transfer_none(GError **err, const gchar **debug)
* Returns: (transfer full): a GError
*/
GError *
-gi_marshalling_tests_gerror_return()
+gi_marshalling_tests_gerror_return(void)
{
GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h
index 3a2fd12a..e4f5cb9b 100644
--- a/tests/gimarshallingtests.h
+++ b/tests/gimarshallingtests.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
* vim: tabstop=4 shiftwidth=4 expandtab
*/
@@ -899,7 +899,7 @@ void gi_marshalling_tests_gerror(GError **error);
void gi_marshalling_tests_gerror_array_in(gint *in_ints, GError **error);
void gi_marshalling_tests_gerror_out(GError **error, gchar **debug);
void gi_marshalling_tests_gerror_out_transfer_none(GError **err, const gchar **debug);
-GError *gi_marshalling_tests_gerror_return();
+GError *gi_marshalling_tests_gerror_return(void);
/* Overrides */
@@ -931,12 +931,12 @@ typedef struct _GIMarshallingTestsOverridesObject GIMarshallingTestsOverridesObj
struct _GIMarshallingTestsOverridesObjectClass
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
};
struct _GIMarshallingTestsOverridesObject
{
- GObject parent_instance;
+ GObject parent_instance;
glong long_;
};
@@ -947,7 +947,6 @@ GIMarshallingTestsOverridesObject *gi_marshalling_tests_overrides_object_new (vo
glong gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject *object);
-
GIMarshallingTestsOverridesObject *gi_marshalling_tests_overrides_object_returnv (void);
#endif /* _GI_MARSHALLING_TESTS_H_ */