luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gtype.h: Fix Build on non-GCC

Browse Source 
Use the (private) _GLIB_DEFINE_AUTOPTR_CHAINUP macro for
G_DECLARE_DERIVABLE_TYPE and G_DECLARE_FINAL_TYPE so that we will
attempt to typedef and define items necessary for GCC
__attribute__((cleanup)) on, well, GCC only.

This fixes the build on non-GCC.

https://bugzilla.gnome.org/show_bug.cgi?id=743640
This commit is contained in:
Chun-wei Fan 2015-02-02 23:25:31 +08:00
parent 696db75615
commit 6161b285da
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/gtype.h
View File

@ -1391,9 +1391,7 @@ guint g_type_get_type_registration_serial (void);
typedef struct _##ModuleObjName ModuleObjName; \ typedef struct _##ModuleObjName ModuleObjName; \
typedef struct { ParentName##Class parent_class; } ModuleObjName##Class; \ typedef struct { ParentName##Class parent_class; } ModuleObjName##Class; \
\ \
typedef ModuleObjName *_GLIB_AUTOPTR_TYPENAME(ModuleObjName); \ _GLIB_DEFINE_AUTOPTR_CHAINUP (ModuleObjName, ParentName) \
static inline void _GLIB_AUTOPTR_FUNC_NAME(ModuleObjName) (ModuleObjName **_ptr) { \
_GLIB_AUTOPTR_FUNC_NAME(ParentName) ((ParentName **) _ptr); } \
\ \
static inline ModuleObjName * MODULE##_##OBJ_NAME (gpointer ptr) { \ static inline ModuleObjName * MODULE##_##OBJ_NAME (gpointer ptr) { \
return G_TYPE_CHECK_INSTANCE_CAST (ptr, module_obj_name##_get_type (), ModuleObjName); } \ return G_TYPE_CHECK_INSTANCE_CAST (ptr, module_obj_name##_get_type (), ModuleObjName); } \
@ -1483,9 +1481,7 @@ guint g_type_get_type_registration_serial (void);
typedef struct _##ModuleObjName##Class ModuleObjName##Class; \ typedef struct _##ModuleObjName##Class ModuleObjName##Class; \
struct _##ModuleObjName { ParentName parent_instance; }; \ struct _##ModuleObjName { ParentName parent_instance; }; \
\ \
typedef ModuleObjName *_GLIB_AUTOPTR_TYPENAME(ModuleObjName); \ _GLIB_DEFINE_AUTOPTR_CHAINUP (ModuleObjName, ParentName) \
static inline void _GLIB_AUTOPTR_FUNC_NAME(ModuleObjName) (ModuleObjName **_ptr) { \
_GLIB_AUTOPTR_FUNC_NAME(ParentName) ((ParentName **) _ptr); } \
\ \
static inline ModuleObjName * MODULE##_##OBJ_NAME (gpointer ptr) { \ static inline ModuleObjName * MODULE##_##OBJ_NAME (gpointer ptr) { \
return G_TYPE_CHECK_INSTANCE_CAST (ptr, module_obj_name##_get_type (), ModuleObjName); } \ return G_TYPE_CHECK_INSTANCE_CAST (ptr, module_obj_name##_get_type (), ModuleObjName); } \