[glib/gvariant: 4/7] Switch from visibility #pragma to glib.symbols



commit ce7a79073f179de98685c5095464bbc6bada14b7
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Apr 5 23:32:31 2009 -0400

    Switch from visibility #pragma to glib.symbols
---
 glib/glib.symbols          |  170 ++++++++++++++++++++++++++++++++++++++++++++
 glib/gvariant-core.c       |    7 ++-
 glib/gvariant-loadstore.h  |    6 --
 glib/gvariant-markup.c     |    5 ++
 glib/gvariant-private.h    |    5 +-
 glib/gvariant-serialiser.c |    5 ++
 glib/gvariant-util.c       |   11 ++-
 glib/gvariant-valist.c     |    5 ++
 glib/gvariant.h            |    4 -
 glib/gvarianttype.c        |    9 ++-
 glib/gvarianttype.h        |   12 +--
 glib/gvarianttypeinfo.c    |    5 ++
 12 files changed, 215 insertions(+), 29 deletions(-)

diff --git a/glib/glib.symbols b/glib/glib.symbols
index dad4d33..60f0430 100644
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1618,6 +1618,175 @@ g_match_info_fetch_all
 #endif
 #endif
 
+#if IN_HEADER(_gvariant_h_)
+#if IN_FILE(_gvariant_core_c_)
+g_variant_ref
+g_variant_ref_sink
+g_variant_unref
+g_variant_get_fixed
+g_variant_get_fixed_array
+g_variant_get_child
+g_variant_n_children
+g_variant_get_type
+#endif
+
+#if IN_FILE(_gvariant_util_c_)
+g_variant_flatten
+g_variant_get_type_class
+g_variant_get_type_string
+g_variant_is_basic
+g_variant_is_container
+g_variant_matches
+g_variant_new_boolean
+g_variant_new_byte
+g_variant_new_uint16
+g_variant_new_int16
+g_variant_new_uint32
+g_variant_new_int32
+g_variant_new_uint64
+g_variant_new_int64
+g_variant_new_double
+g_variant_new_string
+g_variant_new_object_path
+g_variant_is_object_path
+g_variant_new_signature
+g_variant_is_signature
+g_variant_new_variant
+g_variant_get_boolean
+g_variant_get_byte
+g_variant_get_uint16
+g_variant_get_int16
+g_variant_get_uint32
+g_variant_get_int32
+g_variant_get_uint64
+g_variant_get_int64
+g_variant_get_double
+g_variant_get_string
+g_variant_dup_string
+g_variant_get_variant
+g_variant_iter_init
+g_variant_iter_next
+g_variant_iter_cancel
+g_variant_iter_was_cancelled
+g_variant_builder_add_value
+g_variant_builder_open
+g_variant_builder_close
+g_variant_builder_check_add
+g_variant_builder_check_end
+g_variant_builder_new
+g_variant_builder_end
+g_variant_builder_cancel
+#endif
+
+#if IN_FILE(_gvariant_markup_c_)
+g_variant_markup_print
+g_variant_markup_subparser_start
+g_variant_markup_subparser_end
+g_variant_markup_parse_context_new
+g_variant_markup_parse_context_end
+g_variant_markup_parse
+#endif
+
+#if IN_FILE(_gvariant_valist_c_)
+g_variant_iterate
+g_variant_builder_add
+g_variant_new
+g_variant_get
+g_variant_format_string_scan
+g_variant_new_va
+g_variant_get_va
+#endif
+#endif
+
+#if IN_HEADER(_gvarianttype_h_)
+#if IN_FILE(_gvarianttype_c_)
+g_variant_type_string_is_valid
+g_variant_type_string_scan
+g_variant_type_free
+g_variant_type_copy
+g_variant_type_new
+g_variant_type_get_string_length
+g_variant_type_peek_string
+g_variant_type_dup_string
+g_variant_type_is_concrete
+g_variant_type_is_container
+g_variant_type_is_basic
+g_variant_type_hash
+g_variant_type_equal
+g_variant_type_matches
+g_variant_type_is_in_class
+g_variant_type_get_class
+g_variant_type_class_is_container
+g_variant_type_class_is_basic
+g_variant_type_element
+g_variant_type_first
+g_variant_type_next
+g_variant_type_n_items
+g_variant_type_key
+g_variant_type_value
+g_variant_type_new_array
+g_variant_type_new_maybe
+g_variant_type_new_struct_
+g_variant_type_new_dict_entry
+g_variant_type_check_string_
+#endif
+#endif
+
+#if IN_HEADER(_gvarianttypeinfo_h_)
+#if IN_FILE(_gvarianttypeinfo_c_)
+g_variant_type_info_get_type
+g_variant_type_info_get_type_class
+g_variant_type_info_get_string
+g_variant_type_info_query
+g_variant_type_info_element
+g_variant_type_info_query_element
+g_variant_type_info_n_members
+g_variant_type_info_member_info
+g_variant_type_info_get
+g_variant_type_info_ref
+g_variant_type_info_unref
+#endif
+#endif
+
+#if IN_HEADER(_gvariant_serialiser_h_)
+#if IN_FILE(_gvariant_serialiser_c_)
+g_variant_serialised_n_children
+g_variant_serialised_get_child
+g_variant_serialiser_needed_size
+g_variant_serialiser_serialise
+g_variant_serialised_assert_invariant
+g_variant_serialised_is_normal
+g_variant_serialised_byteswap
+#endif
+#endif
+
+#if IN_HEADER(_gvariant_loadstore_h_)
+#if IN_FILE(_gvariant_core_c_)
+g_variant_load
+g_variant_from_slice
+g_variant_from_data
+g_variant_store
+g_variant_get_data
+g_variant_get_size
+#endif
+#endif
+
+#if IN_HEADER(_gvariant_private_h_)
+#if IN_FILE(_gvariant_core_c_)
+g_variant_new_tree
+g_variant_assert_invariant
+g_variant_is_trusted
+g_variant_load_fixed
+g_variant_is_normal_
+#endif
+
+#if IN_FILE(_gvariant_util_c_)
+g_variant_dump_data
+g_variant_iter_should_free
+g_variant_deep_copy
+#endif
+#endif
+
 #if IN_HEADER(__G_WIN32_H__)
 #if IN_FILE(__G_WIN32_H__)
 #ifdef G_OS_WIN32
@@ -1654,4 +1823,5 @@ glib_micro_version
 glib_minor_version
 glib_on_error_halt
 g_mem_gc_friendly
+g_variant_markup_parser
 #endif
diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
index bad16ed..dd018e9 100644
--- a/glib/gvariant-core.c
+++ b/glib/gvariant-core.c
@@ -47,6 +47,8 @@
 #include <string.h>
 #include <glib.h>
 
+#include "galias.h"
+
 /* == SECTION 1: structure declaration, condition constants ============== */
 /**
  * GVariant:
@@ -862,7 +864,7 @@ g_variant_is_trusted (GVariant *value)
 }
 
 gboolean
-_g_variant_is_normal (GVariant *value)
+g_variant_is_normal_ (GVariant *value)
 {
   return g_variant_serialised_is_normal (g_variant_get_gvs (value, NULL));
 }
@@ -1432,3 +1434,6 @@ g_variant_load (const GVariantType *type,
       return g_variant_from_slice (type, slice, size, flags);
     }
 }
+
+#define _gvariant_core_c_
+#include "galiasdef.c"
diff --git a/glib/gvariant-loadstore.h b/glib/gvariant-loadstore.h
index 4249c6a..5e7a1f2 100644
--- a/glib/gvariant-loadstore.h
+++ b/glib/gvariant-loadstore.h
@@ -13,8 +13,6 @@
 
 #include <glib/gvariant.h>
 
-#pragma GCC visibility push (default)
-
 typedef enum
 {
   G_VARIANT_TRUSTED             = 0x00010000,
@@ -41,8 +39,4 @@ void                            g_variant_store                         (GVarian
 gconstpointer                   g_variant_get_data                      (GVariant           *value);
 gsize                           g_variant_get_size                      (GVariant           *value);
 
-void                            g_variant_normalise                     (GVariant           *value);
-
-#pragma GCC visibility pop
-
 #endif /* _gvariant_loadstore_h_ */
diff --git a/glib/gvariant-markup.c b/glib/gvariant-markup.c
index 365ae09..da6e7e7 100644
--- a/glib/gvariant-markup.c
+++ b/glib/gvariant-markup.c
@@ -14,6 +14,8 @@
 
 #include <string.h>
 
+#include "galias.h"
+
 static void
 g_variant_markup_indent (GString *string,
                          gint     indentation)
@@ -978,3 +980,6 @@ g_variant_markup_parse_context_end (GMarkupParseContext  *context,
 
   return value;
 }
+
+#define _gvariant_markup_c_
+#include "galiasdef.c"
diff --git a/glib/gvariant-private.h b/glib/gvariant-private.h
index bfecd96..14e717a 100644
--- a/glib/gvariant-private.h
+++ b/glib/gvariant-private.h
@@ -19,7 +19,6 @@ GVariant                       *g_variant_new_tree                      (const G
                                                                          GVariant           **children,
                                                                          gsize                n_children,
                                                                          gboolean             trusted);
-void                            g_variant_ensure_native_endian          (GVariant            *value);
 void                            g_variant_assert_invariant              (GVariant            *value);
 gboolean                        g_variant_is_trusted                    (GVariant            *value);
 void                            g_variant_dump_data                     (GVariant            *value);
@@ -30,8 +29,6 @@ gboolean                        g_variant_iter_should_free              (GVarian
 GVariant                       *g_variant_deep_copy                     (GVariant            *value);
 
 /* do not use -- only for test cases */
-#pragma GCC visibility push (default)
-gboolean                        _g_variant_is_normal                    (GVariant            *value);
-#pragma GCC visibility pop
+gboolean                        g_variant_is_normal_                    (GVariant            *value);
 
 #endif /* _gvariant_private_h_ */
diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c
index 3fab8eb..03a4592 100644
--- a/glib/gvariant-serialiser.c
+++ b/glib/gvariant-serialiser.c
@@ -14,6 +14,8 @@
 
 #include <string.h>
 
+#include "galias.h"
+
 #ifndef GSIZE_TO_LE
 #if GLIB_SIZEOF_SIZE_T == 4
 # define GSIZE_TO_LE GUINT32_TO_LE
@@ -1246,3 +1248,6 @@ g_variant_serialised_is_normal (GVariantSerialised value)
       g_assert_not_reached ();
   }
 }
+
+#define _gvariant_serialiser_c_
+#include "galiasdef.c"
diff --git a/glib/gvariant-util.c b/glib/gvariant-util.c
index a8ba778..8db4e93 100644
--- a/glib/gvariant-util.c
+++ b/glib/gvariant-util.c
@@ -13,6 +13,8 @@
 
 #include "gvariant-private.h"
 
+#include "galias.h"
+
 /**
  * GVariantIter:
  *
@@ -1648,7 +1650,7 @@ g_variant_is_container (GVariant *value)
   return g_variant_type_class_is_container (g_variant_get_type_class (value));
 }
 
-#include <glib/gstdio.h>
+#include <stdio.h>
 void
 g_variant_dump_data (GVariant *value)
 {
@@ -1671,9 +1673,9 @@ g_variant_dump_data (GVariant *value)
   while (data < end || (i & 15))
     {
       if ((i & 15) == (((gsize) data) & 15) && data < end)
-        g_sprintf (&row[3 * (i & 15) + (i & 8)/8], "%02x  ", *data++);
+        sprintf (&row[3 * (i & 15) + (i & 8)/8], "%02x  ", *data++);
       else
-        g_sprintf (&row[3 * (i & 15) + (i & 8)/8], "    ");
+        sprintf (&row[3 * (i & 15) + (i & 8)/8], "    ");
 
       if ((++i & 15) == 0)
         {
@@ -1761,4 +1763,5 @@ g_variant_deep_copy (GVariant *value)
   }
 }
 
-
+#define _gvariant_util_c_
+#include "galiasdef.c"
diff --git a/glib/gvariant-valist.c b/glib/gvariant-valist.c
index 4b1a555..58279fb 100644
--- a/glib/gvariant-valist.c
+++ b/glib/gvariant-valist.c
@@ -14,6 +14,8 @@
 #include <glib/gmessages.h>
 #include <string.h>
 
+#include "galias.h"
+
 /**
  * g_variant_format_string_scan:
  * @format_string: a pass-by-reference pointer to the start of a
@@ -1128,3 +1130,6 @@ g_variant_builder_add (GVariantBuilder *builder,
 
   g_variant_builder_add_value (builder, variant);
 }
+
+#define _gvariant_valist_c_
+#include "galiasdef.c"
diff --git a/glib/gvariant.h b/glib/gvariant.h
index 338e4ef..911c28e 100644
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -26,8 +26,6 @@ struct OPAQUE_TYPE__GVariantIter
   gpointer private[8];
 };
 
-#pragma GCC visibility push (default)
-
 GVariant                       *g_variant_ref                           (GVariant             *value);
 GVariant                       *g_variant_ref_sink                      (GVariant             *value);
 void                            g_variant_unref                         (GVariant             *value);
@@ -148,8 +146,6 @@ GVariant                       *g_variant_markup_parse                  (const g
                                                                          const GVariantType   *type,
                                                                          GError              **error);
 
-#pragma GCC visibility pop
-
 #define G_VARIANT_BUILDER_ERROR \
     g_quark_from_static_string ("g-variant-builder-error-quark")
 
diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c
index 15d056e..b17d74a 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.c
@@ -14,6 +14,8 @@
 
 #include <string.h>
 
+#include "galias.h"
+
 /**
  * GVariantType:
  *
@@ -306,7 +308,7 @@ g_variant_type_dup_string (const GVariantType *type)
 }
 
 const GVariantType *
-_g_variant_type_check_string (const gchar *type_string)
+g_variant_type_check_string_ (const gchar *type_string)
 {
   g_assert (g_variant_type_string_is_valid (type_string));
 
@@ -879,7 +881,7 @@ g_variant_type_new_struct_slow (const gpointer     *items,
 }
 
 GVariantType *
-_g_variant_type_new_struct (const gpointer     *items,
+g_variant_type_new_struct_ (const gpointer     *items,
                             GVariantTypeGetter  func,
                             gsize               length)
 {
@@ -1020,3 +1022,6 @@ g_variant_type_new_dict_entry (const GVariantType *key,
 
   return (GVariantType *) new;
 }
+
+#define _gvarianttype_c_
+#include "galiasdef.c"
diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
index f95582b..9f3502f 100644
--- a/glib/gvarianttype.h
+++ b/glib/gvarianttype.h
@@ -247,8 +247,6 @@ typedef enum
  **/
 #define G_VARIANT_TYPE_ANY_DICTIONARY       ((const GVariantType *) "ae")
 
-#pragma GCC visibility push (default)
-
 /* type string checking */
 gboolean                        g_variant_type_string_is_valid          (const gchar         *type_string);
 gboolean                        g_variant_type_string_scan              (const gchar        **type_string,
@@ -297,22 +295,20 @@ const GVariantType             *g_variant_type_value                    (const G
 GVariantType                   *g_variant_type_new_array                (const GVariantType  *element);
 GVariantType                   *g_variant_type_new_maybe                (const GVariantType  *element);
 typedef const GVariantType   *(*GVariantTypeGetter)                     (gpointer             data);
-GVariantType                   *_g_variant_type_new_struct              (const gpointer      *items,
+GVariantType                   *g_variant_type_new_struct_              (const gpointer      *items,
                                                                          GVariantTypeGetter   func,
                                                                          gsize                length);
 GVariantType                   *g_variant_type_new_dict_entry           (const GVariantType  *key,
                                                                          const GVariantType  *value);
 
 /*< private >*/
-const GVariantType             *_g_variant_type_check_string            (const gchar         *type_string);
-
-#pragma GCC visibility pop
+const GVariantType             *g_variant_type_check_string_            (const gchar         *type_string);
 
 #define G_VARIANT_TYPE(type_string) \
-  (_g_variant_type_check_string (type_string))
+  (g_variant_type_check_string_ (type_string))
 
 #define g_variant_type_new_struct(items, func, length) \
-  (_g_variant_type_new_struct ((const gpointer *) items, (GVariantTypeGetter) (1 ? func : \
+  (g_variant_type_new_struct_ ((const gpointer *) items, (GVariantTypeGetter) (1 ? func : \
                                (const GVariantType *(*)(typeof (items[0]))) NULL), length))
 
 #endif /* _gvarianttype_h_ */
diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c
index 95a2d11..f634888 100644
--- a/glib/gvarianttypeinfo.c
+++ b/glib/gvarianttypeinfo.c
@@ -11,6 +11,8 @@
 #include "gvarianttypeinfo.h"
 #include <glib.h>
 
+#include "galias.h"
+
 struct OPAQUE_TYPE__GVariantTypeInfo
 {
   GVariantType *type;
@@ -453,3 +455,6 @@ g_variant_type_info_unref (GVariantTypeInfo *info)
       }
     }
 }
+
+#define _gvarianttypeinfo_c_
+#include "galiasdef.c"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]