From f9da22ef0739705a3536214ae8e02b1b46f9722a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 29 Jan 2001 21:33:37 +0000 Subject: [PATCH] Use the same GMutex structure as the configure-generated glibconfig.h 2001-01-29 Tor Lillqvist * glibconfig.h.win32.in: Use the same GMutex structure as the configure-generated glibconfig.h does. * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, says jbdoll@kepri.re.kr. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ glib/gstrfuncs.c | 2 +- glibconfig.h.win32.in | 21 ++++++++++++--------- gstrfuncs.c | 2 +- 11 files changed, 78 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index a875da488..3839b5627 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-01-29 Tor Lillqvist + + * glibconfig.h.win32.in: Use the same GMutex structure as the + configure-generated glibconfig.h does. + + * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, + says jbdoll@kepri.re.kr. + 2001-01-29 Sebastian Wilhelmi * gthread.c: Broadcast the condition, if there are waiting diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a875da488..3839b5627 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2001-01-29 Tor Lillqvist + + * glibconfig.h.win32.in: Use the same GMutex structure as the + configure-generated glibconfig.h does. + + * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, + says jbdoll@kepri.re.kr. + 2001-01-29 Sebastian Wilhelmi * gthread.c: Broadcast the condition, if there are waiting diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a875da488..3839b5627 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2001-01-29 Tor Lillqvist + + * glibconfig.h.win32.in: Use the same GMutex structure as the + configure-generated glibconfig.h does. + + * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, + says jbdoll@kepri.re.kr. + 2001-01-29 Sebastian Wilhelmi * gthread.c: Broadcast the condition, if there are waiting diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a875da488..3839b5627 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2001-01-29 Tor Lillqvist + + * glibconfig.h.win32.in: Use the same GMutex structure as the + configure-generated glibconfig.h does. + + * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, + says jbdoll@kepri.re.kr. + 2001-01-29 Sebastian Wilhelmi * gthread.c: Broadcast the condition, if there are waiting diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a875da488..3839b5627 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2001-01-29 Tor Lillqvist + + * glibconfig.h.win32.in: Use the same GMutex structure as the + configure-generated glibconfig.h does. + + * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, + says jbdoll@kepri.re.kr. + 2001-01-29 Sebastian Wilhelmi * gthread.c: Broadcast the condition, if there are waiting diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a875da488..3839b5627 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2001-01-29 Tor Lillqvist + + * glibconfig.h.win32.in: Use the same GMutex structure as the + configure-generated glibconfig.h does. + + * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, + says jbdoll@kepri.re.kr. + 2001-01-29 Sebastian Wilhelmi * gthread.c: Broadcast the condition, if there are waiting diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a875da488..3839b5627 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2001-01-29 Tor Lillqvist + + * glibconfig.h.win32.in: Use the same GMutex structure as the + configure-generated glibconfig.h does. + + * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, + says jbdoll@kepri.re.kr. + 2001-01-29 Sebastian Wilhelmi * gthread.c: Broadcast the condition, if there are waiting diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a875da488..3839b5627 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2001-01-29 Tor Lillqvist + + * glibconfig.h.win32.in: Use the same GMutex structure as the + configure-generated glibconfig.h does. + + * gstrfuncs.c (g_strsignal): Declare strsignal() on Cygwin, too, + says jbdoll@kepri.re.kr. + 2001-01-29 Sebastian Wilhelmi * gthread.c: Broadcast the condition, if there are waiting diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 792278abd..619d20f13 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -676,7 +676,7 @@ g_strsignal (gint signum) char *msg; #ifdef HAVE_STRSIGNAL -#ifdef G_OS_BEOS +#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN) extern const char * strsignal(int); #else /* !G_OS_BEOS */ /* this is declared differently (const) in string.h on BeOS */ diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index 3e31ad3c2..482a19c26 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -134,19 +134,22 @@ typedef struct _GStaticMutex GStaticMutex; struct _GStaticMutex { struct _GMutex *runtime_mutex; - union { - /* The size of the pad array should be sizeof (pthread_mutex_t) */ - /* This value corresponds to the 1999-05-30 version of pthreads-win32 */ - char pad[4]; - double dummy_double; - void *dummy_pointer; - long dummy_long; - } aligned_pad_u; + struct { + union { + /* The size of the pad array should be sizeof (pthread_mutex_t) */ + /* This value corresponds to the 1999-05-30 version of pthreads-win32 */ + char pad[4]; + double dummy_double; + void *dummy_pointer; + long dummy_long; + } mutex; + void *debug_info; + } static_mutex; }; /* This should be NULL followed by the bytes in PTHREAD_MUTEX_INITIALIZER */ #define G_STATIC_MUTEX_INIT { NULL, { { 255, 255, 255, 255 } } } #define g_static_mutex_get_mutex(mutex) \ - (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \ + (g_thread_use_default_impl ? ((GMutex*) &((mutex)->static_mutex)) : \ g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex))) /* This represents a system thread as used by the implementation. An * alien implementaion, as loaded by g_thread_init can only count on diff --git a/gstrfuncs.c b/gstrfuncs.c index 792278abd..619d20f13 100644 --- a/gstrfuncs.c +++ b/gstrfuncs.c @@ -676,7 +676,7 @@ g_strsignal (gint signum) char *msg; #ifdef HAVE_STRSIGNAL -#ifdef G_OS_BEOS +#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN) extern const char * strsignal(int); #else /* !G_OS_BEOS */ /* this is declared differently (const) in string.h on BeOS */ -- 2.11.4.GIT