luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 21:03:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ebassi/thread-gir' into 'main'

Browse Source 
gir: Hide pthread types in deprecated GThread structures

Closes #3222

See merge request GNOME/glib!3815
This commit is contained in:
Philip Withnall 2024-01-15 12:39:36 +00:00
commit 1964c4f833
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glib/deprecated/gthread.h
View File

@ -135,10 +135,12 @@ void g_thread_foreach (GFunc thread_func,
typedef struct typedef struct
{ {
GMutex *mutex; GMutex *mutex;
#ifndef G_OS_WIN32 #ifndef __GI_SCANNER__
# ifndef G_OS_WIN32
/* only for ABI compatibility reasons */ /* only for ABI compatibility reasons */
pthread_mutex_t unused; pthread_mutex_t unused;
#endif # endif /* !G_OS_WIN32 */
#endif /* !__GI_SCANNER__ */
} GStaticMutex GLIB_DEPRECATED_TYPE_IN_2_32_FOR(GMutex); } GStaticMutex GLIB_DEPRECATED_TYPE_IN_2_32_FOR(GMutex);
#define g_static_mutex_lock(mutex) \ #define g_static_mutex_lock(mutex) \
@ -162,15 +164,17 @@ struct _GStaticRecMutex
GStaticMutex mutex; GStaticMutex mutex;
guint depth; guint depth;
#ifndef __GI_SCANNER__
/* ABI compat only */ /* ABI compat only */
union { union {
#ifdef G_OS_WIN32 # ifdef G_OS_WIN32
void *owner; void *owner;
#else # else
pthread_t owner; pthread_t owner;
#endif # endif /* !G_OS_WIN32 */
gdouble dummy; gdouble dummy;
} unused; } unused;
#endif /* !__GI_SCANNER__ */
} GLIB_DEPRECATED_TYPE_IN_2_32_FOR(GRecMutex); } GLIB_DEPRECATED_TYPE_IN_2_32_FOR(GRecMutex);
#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT, 0, { 0 } } GLIB_DEPRECATED_MACRO_IN_2_32_FOR(g_rec_mutex_init) #define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT, 0, { 0 } } GLIB_DEPRECATED_MACRO_IN_2_32_FOR(g_rec_mutex_init)