luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-05 08:53:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[girepository] Kill girffi-private.h

Browse Source
This commit is contained in:
Johan Dahlin
2010-06-06 23:22:57 -03:00
parent 1edafae79e
commit 6b4647c088
6 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -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 \

5
girepository-private.h
View File

@@ -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__ */

5
girepository.h
View File

@@ -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>

32
girffi-private.h
View File

@@ -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__ */

8
girffi.c
View File

@@ -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));
}
/**

4
giroffsets.c
View File

@@ -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)
{