don't try to use thread stuff unless G_THREADS_ENABLED

2000-12-12  Havoc Pennington  <hp@pobox.com>

* gmain.c (g_main_context_destroy): don't try to use thread stuff
unless G_THREADS_ENABLED
(g_main_context_query): ditto
(g_main_context_check): ditto
(g_main_loop_quit): ditto

diff --git a/ChangeLog b/ChangeLog
index 4dca3db4fcbb90c1692990f2827a5b15b887865d..d44e5fa32aeeb5e070ec7823c074bb72d6f96c0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-12  Havoc Pennington  <hp@pobox.com>
+
+       * gmain.c (g_main_context_destroy): don't try to use thread stuff
+       unless G_THREADS_ENABLED
+       (g_main_context_query): ditto
+       (g_main_context_check): ditto
+       (g_main_loop_quit): ditto
+
 Tue Dec 12 18:58:22 2000  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_remove): return whether a value

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4dca3db4fcbb90c1692990f2827a5b15b887865d..d44e5fa32aeeb5e070ec7823c074bb72d6f96c0c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-12-12  Havoc Pennington  <hp@pobox.com>
+
+       * gmain.c (g_main_context_destroy): don't try to use thread stuff
+       unless G_THREADS_ENABLED
+       (g_main_context_query): ditto
+       (g_main_context_check): ditto
+       (g_main_loop_quit): ditto
+
 Tue Dec 12 18:58:22 2000  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_remove): return whether a value

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4dca3db4fcbb90c1692990f2827a5b15b887865d..d44e5fa32aeeb5e070ec7823c074bb72d6f96c0c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-12-12  Havoc Pennington  <hp@pobox.com>
+
+       * gmain.c (g_main_context_destroy): don't try to use thread stuff
+       unless G_THREADS_ENABLED
+       (g_main_context_query): ditto
+       (g_main_context_check): ditto
+       (g_main_loop_quit): ditto
+
 Tue Dec 12 18:58:22 2000  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_remove): return whether a value

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4dca3db4fcbb90c1692990f2827a5b15b887865d..d44e5fa32aeeb5e070ec7823c074bb72d6f96c0c 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2000-12-12  Havoc Pennington  <hp@pobox.com>
+
+       * gmain.c (g_main_context_destroy): don't try to use thread stuff
+       unless G_THREADS_ENABLED
+       (g_main_context_query): ditto
+       (g_main_context_check): ditto
+       (g_main_loop_quit): ditto
+
 Tue Dec 12 18:58:22 2000  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_remove): return whether a value

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4dca3db4fcbb90c1692990f2827a5b15b887865d..d44e5fa32aeeb5e070ec7823c074bb72d6f96c0c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-12-12  Havoc Pennington  <hp@pobox.com>
+
+       * gmain.c (g_main_context_destroy): don't try to use thread stuff
+       unless G_THREADS_ENABLED
+       (g_main_context_query): ditto
+       (g_main_context_check): ditto
+       (g_main_loop_quit): ditto
+
 Tue Dec 12 18:58:22 2000  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_remove): return whether a value

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4dca3db4fcbb90c1692990f2827a5b15b887865d..d44e5fa32aeeb5e070ec7823c074bb72d6f96c0c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-12-12  Havoc Pennington  <hp@pobox.com>
+
+       * gmain.c (g_main_context_destroy): don't try to use thread stuff
+       unless G_THREADS_ENABLED
+       (g_main_context_query): ditto
+       (g_main_context_check): ditto
+       (g_main_loop_quit): ditto
+
 Tue Dec 12 18:58:22 2000  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_remove): return whether a value

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4dca3db4fcbb90c1692990f2827a5b15b887865d..d44e5fa32aeeb5e070ec7823c074bb72d6f96c0c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-12-12  Havoc Pennington  <hp@pobox.com>
+
+       * gmain.c (g_main_context_destroy): don't try to use thread stuff
+       unless G_THREADS_ENABLED
+       (g_main_context_query): ditto
+       (g_main_context_check): ditto
+       (g_main_loop_quit): ditto
+
 Tue Dec 12 18:58:22 2000  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_remove): return whether a value

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4dca3db4fcbb90c1692990f2827a5b15b887865d..d44e5fa32aeeb5e070ec7823c074bb72d6f96c0c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-12-12  Havoc Pennington  <hp@pobox.com>
+
+       * gmain.c (g_main_context_destroy): don't try to use thread stuff
+       unless G_THREADS_ENABLED
+       (g_main_context_query): ditto
+       (g_main_context_check): ditto
+       (g_main_loop_quit): ditto
+
 Tue Dec 12 18:58:22 2000  Tim Janik  <timj@gtk.org>
 
        * ghash.c (g_hash_table_remove): return whether a value

diff --git a/glib/gmain.c b/glib/gmain.c
index f9b26dd1ca9b3bcb6fce9c8e34f0a076dc9563be..9c60b870c227ad2425256e03409495607b4d2e85 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -514,6 +514,7 @@ g_main_context_destroy (GMainContext *context)
   
   g_mem_chunk_destroy (context->poll_chunk);
 
+#ifdef G_THREADS_ENABLED
   if (g_thread_supported())
     {
 #ifndef G_OS_WIN32
@@ -523,6 +524,7 @@ g_main_context_destroy (GMainContext *context)
       CloseHandle (context->wake_up_semaphore);
 #endif
     }
+#endif
   
   g_free (context);
 }
@@ -1735,8 +1737,10 @@ g_main_context_query (GMainContext *context,
       pollrec = pollrec->next;
     }
 
+#ifdef G_THREADS_ENABLED
   context->poll_changed = FALSE;
-
+#endif
+  
   if (timeout)
     {
       *timeout = context->timeout;
@@ -1791,14 +1795,14 @@ g_main_context_check (GMainContext *context,
     }
   else
     context->poll_waiting = FALSE;
-#endif /* G_THREADS_ENABLED */
 
   /* If the set of poll file descriptors changed, bail out
    * and let the main loop rerun
    */
   if (context->poll_changed)
     return 0;
-
+#endif /* G_THREADS_ENABLED */
+  
   pollrec = context->poll_records;
   i = 0;
   while (i < n_fds)
@@ -2093,8 +2097,10 @@ g_main_loop_quit (GMainLoop *loop)
   LOCK_LOOP (loop);
   loop->is_running = FALSE;
 
+#ifdef G_THREADS_ENABLED
   if (loop->sem_cond)
     g_cond_broadcast (loop->sem_cond);
+#endif
   
   UNLOCK_LOOP (loop);
 

diff --git a/gmain.c b/gmain.c
index f9b26dd1ca9b3bcb6fce9c8e34f0a076dc9563be..9c60b870c227ad2425256e03409495607b4d2e85 100644 (file)
--- a/gmain.c
+++ b/gmain.c
@@ -514,6 +514,7 @@ g_main_context_destroy (GMainContext *context)
   
   g_mem_chunk_destroy (context->poll_chunk);
 
+#ifdef G_THREADS_ENABLED
   if (g_thread_supported())
     {
 #ifndef G_OS_WIN32
@@ -523,6 +524,7 @@ g_main_context_destroy (GMainContext *context)
       CloseHandle (context->wake_up_semaphore);
 #endif
     }
+#endif
   
   g_free (context);
 }
@@ -1735,8 +1737,10 @@ g_main_context_query (GMainContext *context,
       pollrec = pollrec->next;
     }
 
+#ifdef G_THREADS_ENABLED
   context->poll_changed = FALSE;
-
+#endif
+  
   if (timeout)
     {
       *timeout = context->timeout;
@@ -1791,14 +1795,14 @@ g_main_context_check (GMainContext *context,
     }
   else
     context->poll_waiting = FALSE;
-#endif /* G_THREADS_ENABLED */
 
   /* If the set of poll file descriptors changed, bail out
    * and let the main loop rerun
    */
   if (context->poll_changed)
     return 0;
-
+#endif /* G_THREADS_ENABLED */
+  
   pollrec = context->poll_records;
   i = 0;
   while (i < n_fds)
@@ -2093,8 +2097,10 @@ g_main_loop_quit (GMainLoop *loop)
   LOCK_LOOP (loop);
   loop->is_running = FALSE;
 
+#ifdef G_THREADS_ENABLED
   if (loop->sem_cond)
     g_cond_broadcast (loop->sem_cond);
+#endif
   
   UNLOCK_LOOP (loop);