[girepository] Kill girffi-private.h

6 files changed, 14 insertions, 41 deletions

diff --git a/girepository/Makefile.am b/girepository/Makefile.am
index 9faff911..95894125 100644
--- a/girepository/Makefile.am
+++ b/girepository/Makefile.am
@@ -44,7 +44,6 @@ libgirepository_1_0_la_SOURCES =		\
 	girepository-private.h			\
 	girffi.c                                \
 	girffi.h                                \
-	girffi-private.h                        \
 	gisignalinfo.c				\
 	gistructinfo.c				\
 	gitypeinfo.c				\
diff --git a/girepository/girepository-private.h b/girepository/girepository-private.h
index a4c0393e..8382f408 100644
--- a/girepository/girepository-private.h
+++ b/girepository/girepository-private.h
@@ -22,8 +22,11 @@
 #ifndef __GIREPOSITORY_PRIVATE_H__
 #define __GIREPOSITORY_PRIVATE_H__
 
+#include <ffi.h>
 #include <glib.h>
 
+#define __GIREPOSITORY_H_INSIDE__
+
 #include <gibaseinfo.h>
 #include <girepository.h>
 #include <gitypelib.h>
@@ -105,4 +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);
+
 #endif /* __GIREPOSITORY_PRIVATE_H__ */
diff --git a/girepository/girepository.h b/girepository/girepository.h
index 5138e4ae..4b605d23 100644
--- a/girepository/girepository.h
+++ b/girepository/girepository.h
@@ -22,10 +22,11 @@
 #ifndef __G_IREPOSITORY_H__
 #define __G_IREPOSITORY_H__
 
-#define __GIREPOSITORY_H_INSIDE__
-
 #include <glib-object.h>
 #include <gmodule.h>
+
+#define __GIREPOSITORY_H_INSIDE__
+
 #include <giarginfo.h>
 #include <gibaseinfo.h>
 #include <gicallableinfo.h>
diff --git a/girepository/girffi-private.h b/girepository/girffi-private.h
deleted file mode 100644
index 64533500..00000000
--- a/girepository/girffi-private.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* GObject introspection: Private helper functions for ffi integration
- *
- * Copyright (C) 2008, 2009 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GIRFFI_PRIVATE_H__
-#define __GIRFFI_PRIVATE_H__
-
-#include "girffi.h"
-
-G_BEGIN_DECLS
-
-ffi_type *    g_ir_ffi_get_ffi_type               (GITypeTag type_tag, gboolean is_pointer);
-
-G_END_DECLS
-
-#endif /* __GIRFFI_PRIVATE_H__ */
diff --git a/girepository/girffi.c b/girepository/girffi.c
index 6716324e..559af258 100644
--- a/girepository/girffi.c
+++ b/girepository/girffi.c
@@ -27,12 +27,12 @@
 #include <string.h>
 #include <unistd.h>
 #include "girffi.h"
-#include "girffi-private.h"
 #include "girepository.h"
+#include "girepository-private.h"
 
 ffi_type *
-g_ir_ffi_get_ffi_type (GITypeTag   tag,
-                       gboolean    is_pointer)
+_gi_type_tag_get_ffi_type (GITypeTag   tag,
+			   gboolean    is_pointer)
 {
   switch (tag)
     {
@@ -125,7 +125,7 @@ g_ir_ffi_get_ffi_type (GITypeTag   tag,
 ffi_type *
 g_type_info_get_ffi_type (GITypeInfo *info)
 {
-  return g_ir_ffi_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/giroffsets.c b/girepository/giroffsets.c
index 263665ce..5d481da1 100644
--- a/girepository/giroffsets.c
+++ b/girepository/giroffsets.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "girffi-private.h"
+#include "girepository-private.h"
 #include "girnode.h"
 
 /* The C standard specifies that an enumeration can be any char or any signed
@@ -262,7 +262,7 @@ get_type_size_alignment (GIrNodeType *type,
 	}
       else
 	{
-	  type_ffi = g_ir_ffi_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)
 	    {