Export gi_type_tag_get_ffi_type

This is needed by the offsets code, and is generally useful.  We
need to export it for a future patch which won't export symbols
with a leading _.

diff --git a/girepository/girepository-private.h b/girepository/girepository-private.h
index 46b898b09fc11e1e506c1a3483152ab710d646a6..897c52c4c61773c104c1b2a549fe800a1be632a4 100644 (file)
--- a/girepository/girepository-private.h
+++ b/girepository/girepository-private.h
@@ -108,8 +108,6 @@ GIVFuncInfo * _g_base_info_find_vfunc (GIRealInfo   *rinfo,
                                       gint          n_vfuncs,
                                       const gchar  *name);
 
-ffi_type *    _gi_type_tag_get_ffi_type (GITypeTag type_tag, gboolean is_pointer);
-
 extern ffi_status ffi_prep_closure_loc (ffi_closure *,
                                         ffi_cif *,
                                         void (*fun)(ffi_cif *, void *, void **, void *),

diff --git a/girepository/girffi.c b/girepository/girffi.c
index 23b076bca40803c6d22657faa6afb2343b3ce90d..c46d3d3c20eafbcc14f667fad47e1aeba5de227b 100644 (file)
--- a/girepository/girffi.c
+++ b/girepository/girffi.c
@@ -30,9 +30,16 @@
 #include "girepository.h"
 #include "girepository-private.h"
 
+/**
+ * gi_type_tag_get_ffi_type:
+ * @tag: A #GITypeTag
+ * @is_pointer: Whether or not this is a pointer type
+ *
+ * Returns: A #ffi_type corresponding to the platform default C ABI for @tag and @is_pointer.
+ */
 ffi_type *
-_gi_type_tag_get_ffi_type (GITypeTag   tag,
-                          gboolean    is_pointer)
+gi_type_tag_get_ffi_type (GITypeTag   tag,
+                         gboolean    is_pointer)
 {
   switch (tag)
     {
@@ -96,7 +103,7 @@ _gi_type_tag_get_ffi_type (GITypeTag   tag,
 ffi_type *
 g_type_info_get_ffi_type (GITypeInfo *info)
 {
-  return _gi_type_tag_get_ffi_type (g_type_info_get_tag (info), g_type_info_is_pointer (info));
+  return gi_type_tag_get_ffi_type (g_type_info_get_tag (info), g_type_info_is_pointer (info));
 }
 
 /**

diff --git a/girepository/girffi.h b/girepository/girffi.h
index 56d85a189c7afc6a9bc0bbe06065cd61e058b452..a5cc9e4600827c5e6d79a138e402e140d475f3e0 100644 (file)
--- a/girepository/girffi.h
+++ b/girepository/girffi.h
@@ -45,6 +45,8 @@ struct _GIFunctionInvoker {
   gpointer padding[3];
 };
 
+ffi_type *    gi_type_tag_get_ffi_type            (GITypeTag type_tag, gboolean is_pointer);
+
 ffi_type *    g_type_info_get_ffi_type            (GITypeInfo           *info);
 
 gboolean      g_function_info_prep_invoker        (GIFunctionInfo       *info,

diff --git a/girepository/giroffsets.c b/girepository/giroffsets.c
index 94fdc66462fcb4fb00cdb844829f6623596dfd6e..5c16f811c276bc30aeffb84502491af12ce3ec0a 100644 (file)
--- a/girepository/giroffsets.c
+++ b/girepository/giroffsets.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "girepository-private.h"
+#include "girffi.h"
 #include "girnode.h"
 #include <string.h>
 
@@ -296,7 +296,7 @@ get_type_size_alignment (GIrTypelibBuild   *build,
        }
       else
        {
-         type_ffi = _gi_type_tag_get_ffi_type (type->tag, type->is_pointer);
+         type_ffi = gi_type_tag_get_ffi_type (type->tag, type->is_pointer);
 
          if (type_ffi == &ffi_type_void)
            {