Mercurial > vanilla

annotate desktop/dconf/patch-clang.patch @ 1272:a30768258e0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
crypto/mbedtls: initial import
author David Demelier <markand@malikania.fr>
date Wed, 10 Nov 2021 15:12:39 +0100
parents 089b46d20c00
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
496
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 diff --git a/gvdb/gvdb-reader.c b/gvdb/gvdb-reader.c
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 index aa3154feb901f244fa184a66ac7198072c038c4f..638649b29d9a9fa2ebba1939ef7f72c92ef0a287 100644
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 --- a/gvdb/gvdb-reader.c
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 +++ b/gvdb/gvdb-reader.c
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 @@ -17,6 +17,7 @@
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 * Author: Ryan Lortie <desrt@desrt.ca>
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 */
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
8
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 +#define GVDB_USE_WEAK_SYMBOLS
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 #include "gvdb-reader.h"
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 #include "gvdb-format.h"
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
12
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 diff --git a/gvdb/gvdb-reader.h b/gvdb/gvdb-reader.h
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 index 39827737d94dc7889e53b609c25c7ac8e2b3b870..1e88e43dcc3c212e727d2bf0c771f8e86caa90d7 100644
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 --- a/gvdb/gvdb-reader.h
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 +++ b/gvdb/gvdb-reader.h
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 @@ -22,40 +22,55 @@
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
18
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 #include <glib.h>
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
20
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 +/* We cannot enable the weak attribute unconditionally here because both
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 + * gvdb/gvdb-reader.c and tests/dconf-mock-gvdb.c include this file. The
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 + * intention of using weak symbols here is to allow the latter to override
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 + * functions defined in the former, so functions in tests/dconf-mock-gvdb.c
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 + * must have strong bindings. */
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 +#ifdef GVDB_USE_WEAK_SYMBOLS
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 +# ifdef __GNUC__
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 +# define GVDB_GNUC_WEAK __attribute__((weak))
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 +# else
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 +# define GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 +# endif
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 +#else
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 +# define GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 +#endif
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 +
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 typedef struct _GvdbTable GvdbTable;
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
37
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 G_BEGIN_DECLS
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
39
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 GvdbTable * gvdb_table_new_from_bytes (GBytes *bytes,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 gboolean trusted,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 GError **error);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 GvdbTable * gvdb_table_new (const gchar *filename,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 gboolean trusted,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 GError **error);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 void gvdb_table_free (GvdbTable *table);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 gchar ** gvdb_table_get_names (GvdbTable *table,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 gint *length);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
58 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
59 gchar ** gvdb_table_list (GvdbTable *table,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 const gchar *key);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
61 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
62 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
63 GvdbTable * gvdb_table_get_table (GvdbTable *table,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
64 const gchar *key);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
65 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
66 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
67 GVariant * gvdb_table_get_raw_value (GvdbTable *table,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
68 const gchar *key);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
69 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
70 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
71 GVariant * gvdb_table_get_value (GvdbTable *table,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
72 const gchar *key);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
73
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
74 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
75 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
76 gboolean gvdb_table_has_value (GvdbTable *table,
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
77 const gchar *key);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
78 -G_GNUC_INTERNAL
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
79 +G_GNUC_INTERNAL GVDB_GNUC_WEAK
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
80 gboolean gvdb_table_is_valid (GvdbTable *table);
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
81
089b46d20c00 desktop: convert packages to clang
David Demelier <markand@malikania.fr>
parents:
diff changeset
82 G_END_DECLS