@@ -37,66 +37,13 @@ gchar *g_canonicalize_filename (const gchar *filename,
37
37
const gchar * relative_to );
38
38
#endif
39
39
40
- #ifndef g_atomic_pointer_add
41
-
42
- /* This implementation was copied from glib 2.46, copyright Ryan Lortie
43
- * under the LGPL 2 or later, which is compatible with our LGPL 2.1 license.
44
- * NOTE: this code only runs if we are running on an old glib version (e.g.
45
- * older than 2.32)
46
- * */
47
-
48
- #define g_atomic_pointer_add (atomic , val ) \
49
- (G_GNUC_EXTENSION ({ \
50
- G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
51
- (void) (0 ? (gpointer) *(atomic) : NULL); \
52
- (void) (0 ? (val) ^ (val) : 1); \
53
- (gssize) __sync_fetch_and_add ((atomic), (val)); \
54
- }))
55
- #define g_atomic_pointer_or (atomic , val ) \
56
- (G_GNUC_EXTENSION ({ \
57
- G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
58
- (void) (0 ? (gpointer) *(atomic) : NULL); \
59
- (void) (0 ? (val) ^ (val) : 1); \
60
- (gsize) __sync_fetch_and_or ((atomic), (val)); \
61
- }))
62
- #define g_atomic_pointer_xor (atomic , val ) \
63
- (G_GNUC_EXTENSION ({ \
64
- G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
65
- (void) (0 ? (gpointer) *(atomic) : NULL); \
66
- (void) (0 ? (val) ^ (val) : 1); \
67
- (gsize) __sync_fetch_and_xor ((atomic), (val)); \
68
- }))
69
- #define g_atomic_pointer_and (atomic , val ) \
70
- (G_GNUC_EXTENSION ({ \
71
- G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
72
- (void) (0 ? (gpointer) *(atomic) : NULL); \
73
- (void) (0 ? (val) ^ (val) : 1); \
74
- (gsize) __sync_fetch_and_and ((atomic), (val)); \
75
- }))
76
-
77
- #endif
78
-
79
- #ifndef SYSLOG_NG_HAVE_G_QUEUE_FREE_FULL
80
- void g_queue_free_full (GQueue * queue , GDestroyNotify free_func );
81
- #endif
82
-
83
- #ifndef SYSLOG_NG_HAVE_G_LIST_FREE_FULL
84
- void g_list_free_full (GList * list , GDestroyNotify free_func );
85
- #endif
86
-
87
40
#ifndef SYSLOG_NG_HAVE_G_PTR_ARRAY_FIND_WITH_EQUAL_FUNC
88
41
gboolean g_ptr_array_find_with_equal_func (GPtrArray * haystack ,
89
42
gconstpointer needle ,
90
43
GEqualFunc equal_func ,
91
44
guint * index_ );
92
45
#endif
93
46
94
- #ifndef SYSLOG_NG_HAVE_G_HASH_TABLE_CONTAINS
95
- gboolean
96
- g_hash_table_contains (GHashTable * hash_table ,
97
- gconstpointer key );
98
- #endif
99
-
100
47
#if !GLIB_CHECK_VERSION (2 , 54 , 0 )
101
48
#define g_base64_encode g_base64_encode_fixed
102
49
gchar * g_base64_encode_fixed (const guchar * data , gsize len );
@@ -112,17 +59,4 @@ gboolean slng_g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointe
112
59
gunichar g_utf8_get_char_validated_fixed (const gchar * p , gssize max_len );
113
60
#endif
114
61
115
- #if !GLIB_CHECK_VERSION (2 , 32 , 0 )
116
- GThread * g_thread_new (const gchar * name , GThreadFunc func , gpointer data );
117
- #endif
118
-
119
- #if !GLIB_CHECK_VERSION (2 , 32 , 0 )
120
- gboolean g_cond_wait_until (GCond * cond , GMutex * mutex , gint64 end_time );
121
- #endif
122
-
123
- #if !GLIB_CHECK_VERSION (2 , 30 , 0 )
124
- gchar * g_mkdtemp_full (gchar * tmpl , gint mode );
125
- gchar * g_mkdtemp (gchar * tmpl );
126
- #endif
127
-
128
62
#endif
0 commit comments