luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't try to use thread stuff unless G_THREADS_ENABLED

Browse Source 
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
This commit is contained in:
Havoc Pennington 2000-12-13 04:23:45 +00:00 committed by Havoc Pennington
parent 9a8c33db5c
commit 9edb08492d
10 changed files with 82 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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

8
ChangeLog.pre-2-0
View File

@ -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

8
ChangeLog.pre-2-10
View File

@ -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

8
ChangeLog.pre-2-12
View File

@ -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

8
ChangeLog.pre-2-2
View File

@ -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

8
ChangeLog.pre-2-4
View File

@ -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

8
ChangeLog.pre-2-6
View File

@ -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

8
ChangeLog.pre-2-8
View File

@ -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

12
glib/gmain.c
View File

@ -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);

12
gmain.c
View File

@ -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);