Fix: add compat for glib < 2.32
A message that is not in the archive (sent off-list or not yet received): [email protected]
Merged with some fixes, see below.
Thanks!
Jérémie
Quoted 36 lines · Michael Jeanson
A dependency on glib >= 2.32 was introduced in this commit:
commit
347829f5b1eaf79a540f4623f7ae5ee4e9e3d4c7Author: Philippe Proulx <[email protected]> Date: Thu Mar 12 16:14:31 2015 -0400Add basic object system
To stay compatible with SLES11, keep our dependency on 2.22 and add a compatibility header.
Signed-off-by Michael Jeanson <[email protected]>--- include/Makefile.am | 1 + include/babeltrace/compat/glib.h | 80 ++++++++++++++++++++++++++++++++++++++++ lib/values.c | 6 +-- 3 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 include/babeltrace/compat/glib.hinclude/Makefile.am +1
-0@@ -71,5 +71,6 @@ noinst_HEADERS = \ babeltrace/compat/string.h \ babeltrace/compat/utc.h \ babeltrace/compat/limits.h \ + babeltrace/compat/glib.h \ babeltrace/endian.h \ babeltrace/mmap-align.hinclude/babeltrace/compat/glib.h new file +0
-0
include/babeltrace/compat/glib.h line 5
Quoted 5 lines
include/babeltrace/compat/glib.h new file +5
-0@@ -0,0 +1,80 @@ +#ifndef _BABELTRACE_COMPAT_GLIB_H +#define _BABELTRACE_COMPAT_GLIB_H + +/* +* babeltrace/compat/uuid.h
Changing this to reflect the file name.
Quoted 58 lines
include/babeltrace/compat/glib.h new file +58
-0+* +* Copyright (C) 2015 Michael Jeanson <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +* SOFTWARE. +*/ + +#include <glib.h> + +#if GLIB_CHECK_VERSION (2 ,31 ,8 ) + +static inline gboolean +babeltrace_g_hash_table_contains (GHashTable *hash_table,gconstpointer key) +{ +return g_hash_table_contains (hash_table, key); +} + +#else + +static inline gboolean +babeltrace_g_hash_table_contains (GHashTable *hash_table,gconstpointer key) +{ +const char *value; + + value =g_hash_table_lookup (hash_table, key); +if (value ==NULL ) { +return FALSE; + } + +return TRUE; +} + +#endif + + +#if GLIB_CHECK_VERSION (2 ,29 ,16 ) + +static inline GPtrArray * +babeltrace_g_ptr_array_new_full (guint reserved_size, +GDestroyNotify element_free_func) +{ +return g_ptr_array_new_full (reserved_size, element_free_func); +}
include/babeltrace/compat/glib.h line 73
Quoted 10 lines
include/babeltrace/compat/glib.h new file +10
-0+ +#else + +static inline GPtrArray * +babeltrace_g_ptr_array_new_full (guint reserved_size, +GDestroyNotify element_free_func) +{ +GPtrArray *array; + + array =g_ptr_array_sized_new (reserved_size);
Missing NULL check here.
Quoted 41 lines
include/babeltrace/compat/glib.h new file +7
-0+g_ptr_array_set_free_func (array, element_free_func); + +return array; +} +#endif + +#endif /* _BABELTRACE_COMPAT_GLIB_H */ lib/values.c +3
-4@@ -33,7 +33,7 @@#include <babeltrace/object-internal.h> #include <babeltrace/ref.h> #include <babeltrace/values.h> -#include <glib.h> +#include <babeltrace/compat/glib.h> #define BT_VALUE_FROM_CONCRETE (_concrete) ((struct bt_value *) (_concrete))#define BT_VALUE_TO_BOOL (_base) ((struct bt_value_bool *) (_base))@@ -606,7 +606,7 @@ struct bt_value *bt_value_array_create(void) } array_obj->base =bt_value_create_base (BT_VALUE_TYPE_ARRAY ); - array_obj->garray =g_ptr_array_new_full (0 , + array_obj->garray =babeltrace_g_ptr_array_new_full (0 , (GDestroyNotify ) bt_put);if (!array_obj->garray) {@@ -1028,7 +1028,7 @@ bool bt_value_map_has_key(const struct bt_value *map_obj, const char *key) } quark =g_quark_from_string (key); - ret =g_hash_table_contains (typed_map_obj->ght, + ret =babeltrace_g_hash_table_contains (typed_map_obj->ght,GUINT_TO_POINTER (quark)); end: --1.9.1
Signature · 8 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev