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

Merge branch 'wip/lantw/use-weak-symbols-in-gvdb' into 'master'

Browse Source 
build: Use weak bindings in gvdb to fix linking with LLD

Closes dconf#47

See merge request GNOME/gvdb!2
This commit is contained in:
Michael Catanzaro 2018-11-21 16:48:01 +00:00
commit 1fb31a16c3
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gvdb-reader.h
View File

@ -22,40 +22,55 @@
#include <glib.h> #include <glib.h>
/* We cannot enable the weak attribute unconditionally here because both
* gvdb/gvdb-reader.c and tests/dconf-mock-gvdb.c include this file. The
* intention of using weak symbols here is to allow the latter to override
* functions defined in the former, so functions in tests/dconf-mock-gvdb.c
* must have strong bindings. */
#ifdef GVDB_USE_WEAK_SYMBOLS
# ifdef __GNUC__
# define GVDB_GNUC_WEAK __attribute__((weak))
# else
# define GVDB_GNUC_WEAK
# endif
#else
# define GVDB_GNUC_WEAK
#endif
typedef struct _GvdbTable GvdbTable; typedef struct _GvdbTable GvdbTable;
G_BEGIN_DECLS G_BEGIN_DECLS
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
GvdbTable * gvdb_table_new_from_bytes (GBytes *bytes, GvdbTable * gvdb_table_new_from_bytes (GBytes *bytes,
gboolean trusted, gboolean trusted,
GError **error); GError **error);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
GvdbTable * gvdb_table_new (const gchar *filename, GvdbTable * gvdb_table_new (const gchar *filename,
gboolean trusted, gboolean trusted,
GError **error); GError **error);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
void gvdb_table_free (GvdbTable *table); void gvdb_table_free (GvdbTable *table);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
gchar ** gvdb_table_get_names (GvdbTable *table, gchar ** gvdb_table_get_names (GvdbTable *table,
gsize *length); gsize *length);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
gchar ** gvdb_table_list (GvdbTable *table, gchar ** gvdb_table_list (GvdbTable *table,
const gchar *key); const gchar *key);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
GvdbTable * gvdb_table_get_table (GvdbTable *table, GvdbTable * gvdb_table_get_table (GvdbTable *table,
const gchar *key); const gchar *key);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
GVariant * gvdb_table_get_raw_value (GvdbTable *table, GVariant * gvdb_table_get_raw_value (GvdbTable *table,
const gchar *key); const gchar *key);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
GVariant * gvdb_table_get_value (GvdbTable *table, GVariant * gvdb_table_get_value (GvdbTable *table,
const gchar *key); const gchar *key);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
gboolean gvdb_table_has_value (GvdbTable *table, gboolean gvdb_table_has_value (GvdbTable *table,
const gchar *key); const gchar *key);
G_GNUC_INTERNAL G_GNUC_INTERNAL GVDB_GNUC_WEAK
gboolean gvdb_table_is_valid (GvdbTable *table); gboolean gvdb_table_is_valid (GvdbTable *table);
G_END_DECLS G_END_DECLS