diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-01-15 18:56:21 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-01-15 18:56:21 +0100 |
| commit | ddb7d915a7509a35986ee77d83aa230ccbd028a6 (patch) | |
| tree | cb5538cfc8ad5d48895fae61b82b48338b817f9b /libmm-glib/mm-common-helpers.h | |
| parent | 40e9434cc36174506ed9bbd01c8f78eaea673a2f (diff) | |
libmm-glib: unconditionally define autoptr support for all types
As we now depend on glib 2.48
Diffstat (limited to 'libmm-glib/mm-common-helpers.h')
| -rw-r--r-- | libmm-glib/mm-common-helpers.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libmm-glib/mm-common-helpers.h b/libmm-glib/mm-common-helpers.h index 5af58422..e910d8c0 100644 --- a/libmm-glib/mm-common-helpers.h +++ b/libmm-glib/mm-common-helpers.h @@ -182,27 +182,4 @@ gboolean mm_utils_ishexstr (const gchar *hex); gboolean mm_utils_check_for_single_value (guint32 value); -#if GLIB_CHECK_VERSION(2, 44, 0) -#define mm_autoptr g_autoptr -#else - -/* Re-implement for those glib that don't have it */ -#define _MM_AUTOPTR_FUNC_NAME(TypeName) mm_autoptr_cleanup_##TypeName -#define _MM_AUTOPTR_TYPENAME(TypeName) TypeName##_autoptr -#define _MM_CLEANUP(func) __attribute__((cleanup(func))) - -#define _MM_DEFINE_AUTOPTR_CLEANUP_FUNCS(TypeName, cleanup) \ - typedef TypeName *_MM_AUTOPTR_TYPENAME(TypeName); \ - G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ - static G_GNUC_UNUSED inline void _MM_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) \ - { if (_ptr && *_ptr) (cleanup) (*_ptr); } \ - G_GNUC_END_IGNORE_DEPRECATIONS - -#define mm_autoptr(TypeName) _MM_CLEANUP(_MM_AUTOPTR_FUNC_NAME(TypeName)) _MM_AUTOPTR_TYPENAME(TypeName) - -_MM_DEFINE_AUTOPTR_CLEANUP_FUNCS(GRegex, g_regex_unref) -_MM_DEFINE_AUTOPTR_CLEANUP_FUNCS(GMatchInfo, g_match_info_unref) - -#endif - #endif /* MM_COMMON_HELPERS_H */ |