[glib/gsettings: 5/327] GVariant C++ header fixups

[Ryan Lortie <ryanl src gnome org>]

commit bb7fe2a9f22e9ae01e60b9621933402d166ec7fe
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Apr 7 14:47:31 2009 -0400

    GVariant C++ header fixups

 glib/gvariant-loadstore.h |    4 ++++
 glib/gvariant.h           |   12 ++++++++----
 glib/gvarianttype.h       |   10 +++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/glib/gvariant-loadstore.h b/glib/gvariant-loadstore.h
index 5e7a1f2..7032fd7 100644
--- a/glib/gvariant-loadstore.h
+++ b/glib/gvariant-loadstore.h
@@ -19,6 +19,8 @@ typedef enum
   G_VARIANT_LAZY_BYTESWAP       = 0x00020000,
 } GVariantFlags;
 
+G_BEGIN_DECLS
+
 GVariant                       *g_variant_load                          (const GVariantType *type,
                                                                          gconstpointer       data,
                                                                          gsize               size,
@@ -39,4 +41,6 @@ void                            g_variant_store                         (GVarian
 gconstpointer                   g_variant_get_data                      (GVariant           *value);
 gsize                           g_variant_get_size                      (GVariant           *value);
 
+G_END_DECLS
+
 #endif /* _gvariant_loadstore_h_ */
diff --git a/glib/gvariant.h b/glib/gvariant.h
index 911c28e..0054e78 100644
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -23,9 +23,11 @@ typedef struct                  OPAQUE_TYPE__GVariantBuilder            GVariant
 
 struct OPAQUE_TYPE__GVariantIter
 {
-  gpointer private[8];
+  gpointer priv[8];
 };
 
+G_BEGIN_DECLS
+
 GVariant                       *g_variant_ref                           (GVariant             *value);
 GVariant                       *g_variant_ref_sink                      (GVariant             *value);
 void                            g_variant_unref                         (GVariant             *value);
@@ -113,16 +115,16 @@ void                            g_variant_builder_add                   (GVarian
                                                                          const gchar          *format_string,
                                                                          ...);
 GVariantBuilder                *g_variant_builder_open                  (GVariantBuilder      *parent,
-                                                                         GVariantTypeClass     class,
+                                                                         GVariantTypeClass     tclass,
                                                                          const GVariantType   *type);
 GVariantBuilder                *g_variant_builder_close                 (GVariantBuilder      *child);
 gboolean                        g_variant_builder_check_add             (GVariantBuilder      *builder,
-                                                                         GVariantTypeClass     class,
+                                                                         GVariantTypeClass     tclass,
                                                                          const GVariantType   *type,
                                                                          GError              **error);
 gboolean                        g_variant_builder_check_end             (GVariantBuilder      *builder,
                                                                          GError              **error);
-GVariantBuilder                *g_variant_builder_new                   (GVariantTypeClass     class,
+GVariantBuilder                *g_variant_builder_new                   (GVariantTypeClass     tclass,
                                                                          const GVariantType   *type);
 GVariant                       *g_variant_builder_end                   (GVariantBuilder      *builder);
 void                            g_variant_builder_cancel                (GVariantBuilder      *builder);
@@ -146,6 +148,8 @@ GVariant                       *g_variant_markup_parse                  (const g
                                                                          const GVariantType   *type,
                                                                          GError              **error);
 
+G_END_DECLS
+
 #define G_VARIANT_BUILDER_ERROR \
     g_quark_from_static_string ("g-variant-builder-error-quark")
 
diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
index 9f3502f..cded623 100644
--- a/glib/gvarianttype.h
+++ b/glib/gvarianttype.h
@@ -247,6 +247,8 @@ typedef enum
  **/
 #define G_VARIANT_TYPE_ANY_DICTIONARY       ((const GVariantType *) "ae")
 
+G_BEGIN_DECLS
+
 /* type string checking */
 gboolean                        g_variant_type_string_is_valid          (const gchar         *type_string);
 gboolean                        g_variant_type_string_scan              (const gchar        **type_string,
@@ -278,10 +280,10 @@ gboolean                        g_variant_type_matches                  (const G
 
 /* class functions */
 gboolean                        g_variant_type_is_in_class              (const GVariantType  *type,
-                                                                         GVariantTypeClass    class);
+                                                                         GVariantTypeClass    tclass);
 GVariantTypeClass               g_variant_type_get_class                (const GVariantType  *type);
-gboolean                        g_variant_type_class_is_container       (GVariantTypeClass    class);
-gboolean                        g_variant_type_class_is_basic           (GVariantTypeClass    class);
+gboolean                        g_variant_type_class_is_container       (GVariantTypeClass    tclass);
+gboolean                        g_variant_type_class_is_basic           (GVariantTypeClass    tclass);
 
 /* type iterator interface */
 const GVariantType             *g_variant_type_element                  (const GVariantType  *type);
@@ -304,6 +306,8 @@ GVariantType                   *g_variant_type_new_dict_entry           (const G
 /*< private >*/
 const GVariantType             *g_variant_type_check_string_            (const gchar         *type_string);
 
+G_END_DECLS
+
 #define G_VARIANT_TYPE(type_string) \
   (g_variant_type_check_string_ (type_string))