luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move prerequisites out of _prot struct

Browse Source 
Also fix the naming (including typo)
This commit is contained in:
Benjamin Otte 2010-02-11 21:05:41 +01:00
parent 1e6b184225
commit 61b649cffd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/gtype.c
View File

@ -230,7 +230,7 @@ struct _TypeNode
GTypePlugin *plugin; GTypePlugin *plugin;
guint n_children; /* writable with lock */ guint n_children; /* writable with lock */
guint n_supers : 8; guint n_supers : 8;
guint _prot_n_prerequisites : 9; guint n_prerequisites : 9;
guint is_classed : 1; guint is_classed : 1;
guint is_instantiatable : 1; guint is_instantiatable : 1;
guint mutatable_check_cache : 1; /* combines some common path checks */ guint mutatable_check_cache : 1; /* combines some common path checks */
@ -240,8 +240,8 @@ struct _TypeNode
GData *global_gdata; GData *global_gdata;
union { union {
GAtomicArray iface_entries; /* for !iface types */ GAtomicArray iface_entries; /* for !iface types */
GType *prerequisistes;
} _prot; } _prot;
GType *prerequisites;
GType supers[1]; /* flexible array */ GType supers[1]; /* flexible array */
}; };
@ -259,8 +259,8 @@ struct _TypeNode
#define NODE_IS_IFACE(node) (NODE_FUNDAMENTAL_TYPE (node) == G_TYPE_INTERFACE) #define NODE_IS_IFACE(node) (NODE_FUNDAMENTAL_TYPE (node) == G_TYPE_INTERFACE)
#define CLASSED_NODE_IFACES_ENTRIES(node) (&(node)->_prot.iface_entries) #define CLASSED_NODE_IFACES_ENTRIES(node) (&(node)->_prot.iface_entries)
#define CLASSED_NODE_IFACES_ENTRIES_LOCKED(node)(G_ATOMIC_ARRAY_GET_LOCKED(CLASSED_NODE_IFACES_ENTRIES((node)), IFaceEntries)) #define CLASSED_NODE_IFACES_ENTRIES_LOCKED(node)(G_ATOMIC_ARRAY_GET_LOCKED(CLASSED_NODE_IFACES_ENTRIES((node)), IFaceEntries))
#define IFACE_NODE_N_PREREQUISITES(node) ((node)->_prot_n_prerequisites) #define IFACE_NODE_N_PREREQUISITES(node) ((node)->n_prerequisites)
#define IFACE_NODE_PREREQUISITES(node) ((node)->_prot.prerequisistes) #define IFACE_NODE_PREREQUISITES(node) ((node)->prerequisites)
#define iface_node_get_holders_L(node) ((IFaceHolder*) type_get_qdata_L ((node), static_quark_iface_holder)) #define iface_node_get_holders_L(node) ((IFaceHolder*) type_get_qdata_L ((node), static_quark_iface_holder))
#define iface_node_set_holders_W(node, holders) (type_set_qdata_W ((node), static_quark_iface_holder, (holders))) #define iface_node_set_holders_W(node, holders) (type_set_qdata_W ((node), static_quark_iface_holder, (holders)))
#define iface_node_get_dependants_array_L(n) ((GType*) type_get_qdata_L ((n), static_quark_dependants_array)) #define iface_node_get_dependants_array_L(n) ((GType*) type_get_qdata_L ((n), static_quark_dependants_array))