Use the same GMutex structure as the configure-generated glibconfig.h

2001-01-29  Tor Lillqvist  <tml@iki.fi>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index a875da4..3839b56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-29  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <wilhelmi@ira.uka.de>
 
        * gthread.c: Broadcast the condition, if there are waiting

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a875da4..3839b56 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-01-29  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <wilhelmi@ira.uka.de>
 
        * gthread.c: Broadcast the condition, if there are waiting

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a875da4..3839b56 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-01-29  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <wilhelmi@ira.uka.de>
 
        * gthread.c: Broadcast the condition, if there are waiting

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a875da4..3839b56 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2001-01-29  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <wilhelmi@ira.uka.de>
 
        * gthread.c: Broadcast the condition, if there are waiting

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a875da4..3839b56 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-01-29  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <wilhelmi@ira.uka.de>
 
        * gthread.c: Broadcast the condition, if there are waiting

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a875da4..3839b56 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-01-29  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <wilhelmi@ira.uka.de>
 
        * gthread.c: Broadcast the condition, if there are waiting

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a875da4..3839b56 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-01-29  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <wilhelmi@ira.uka.de>
 
        * gthread.c: Broadcast the condition, if there are waiting

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a875da4..3839b56 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-01-29  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <wilhelmi@ira.uka.de>
 
        * gthread.c: Broadcast the condition, if there are waiting

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 792278a..619d20f 100644 (file)
--- 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 3e31ad3..482a19c 100644 (file)
--- 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 792278a..619d20f 100644 (file)
--- 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 */