From f18db7d2d498c80d58d2ac7abb082529d3b06a12 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Wed, 18 Feb 2004 09:14:17 +0000 Subject: [PATCH] Set context->wake_up_pipe only for G_THREADS_ENABLED. 2004-02-18 Sebastian Wilhelmi * glib/gmain.c (g_main_context_new): Set context->wake_up_pipe only for G_THREADS_ENABLED. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmain.c | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a027e99..4e97501 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-18 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_new): Set context->wake_up_pipe + only for G_THREADS_ENABLED. + Sat Feb 14 11:05:26 2004 Manish Singh * configure.in: Remove unnecessary STRIP_* definitions, and GNU diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a027e99..4e97501 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-02-18 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_new): Set context->wake_up_pipe + only for G_THREADS_ENABLED. + Sat Feb 14 11:05:26 2004 Manish Singh * configure.in: Remove unnecessary STRIP_* definitions, and GNU diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a027e99..4e97501 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-02-18 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_new): Set context->wake_up_pipe + only for G_THREADS_ENABLED. + Sat Feb 14 11:05:26 2004 Manish Singh * configure.in: Remove unnecessary STRIP_* definitions, and GNU diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a027e99..4e97501 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-02-18 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_new): Set context->wake_up_pipe + only for G_THREADS_ENABLED. + Sat Feb 14 11:05:26 2004 Manish Singh * configure.in: Remove unnecessary STRIP_* definitions, and GNU diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a027e99..4e97501 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-02-18 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_new): Set context->wake_up_pipe + only for G_THREADS_ENABLED. + Sat Feb 14 11:05:26 2004 Manish Singh * configure.in: Remove unnecessary STRIP_* definitions, and GNU diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a027e99..4e97501 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-02-18 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_new): Set context->wake_up_pipe + only for G_THREADS_ENABLED. + Sat Feb 14 11:05:26 2004 Manish Singh * configure.in: Remove unnecessary STRIP_* definitions, and GNU diff --git a/glib/gmain.c b/glib/gmain.c index 18e503b..303c2bb 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -745,10 +745,10 @@ g_main_context_new () context->owner = NULL; context->waiters = NULL; -#endif context->wake_up_pipe[0] = -1; context->wake_up_pipe[1] = -1; +#endif context->ref_count = 1; -- 2.7.4