build: Allow ostree to use g_autoptr on its types internally
As an example, I g_autoptred one OstreeRepo in the "ostree init" command. Closes: #295 Approved by: cgwalters
This commit is contained in:
parent
24e3ccb780
commit
d5f6104335
|
|
@ -24,6 +24,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
|
|||
-DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DSHORTENED_SYSCONFDIR=\"$(shortened_sysconfdir)\" \
|
||||
-DOSTREE_FEATURES='"$(OSTREE_FEATURES)"' \
|
||||
-DOSTREE_COMPILATION \
|
||||
-DG_LOG_DOMAIN=\"OSTree\" \
|
||||
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 \
|
||||
-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_48
|
||||
|
|
|
|||
|
|
@ -30,7 +30,10 @@ G_BEGIN_DECLS
|
|||
#define OSTREE_WITH_AUTOCLEANUPS 0
|
||||
#endif
|
||||
|
||||
#if OSTREE_WITH_AUTOCLEANUPS && GLIB_CHECK_VERSION(2, 44, 0)
|
||||
/* ostree can use g_autoptr backports from libglnx when glib is too
|
||||
* old, but still avoid exposing them to users that also have an old
|
||||
* glib */
|
||||
#if defined(OSTREE_COMPILATION) || (OSTREE_WITH_AUTOCLEANUPS && GLIB_CHECK_VERSION(2, 44, 0))
|
||||
|
||||
/*
|
||||
* The following types have no specific clear/free/unref functions, so
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ gboolean
|
|||
ostree_builtin_init (int argc, char **argv, GCancellable *cancellable, GError **error)
|
||||
{
|
||||
GOptionContext *context = NULL;
|
||||
glnx_unref_object OstreeRepo *repo = NULL;
|
||||
g_autoptr(OstreeRepo) repo = NULL;
|
||||
gboolean ret = FALSE;
|
||||
OstreeRepoMode mode;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue