From c54892b11bfe2590bee3320914c9df80a81ecc79 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Thu, 25 Nov 1999 13:47:55 +0000 Subject: [PATCH] This of course should return TRUE in a program with a thread-disabled 1999-11-25 Sebastian Wilhelmi * glib.h (G_TRYLOCK): This of course should return TRUE in a program with a thread-disabled GLib. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib.h | 2 +- glib/glib.h | 2 +- 10 files changed, 42 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5da22a55..ba135d34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-11-25 Sebastian Wilhelmi + + * glib.h (G_TRYLOCK): This of course should return TRUE in a + program with a thread-disabled GLib. + 1999-11-18 Tor Lillqvist * glib.def: g_strjoin was missing. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5da22a55..ba135d34 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +1999-11-25 Sebastian Wilhelmi + + * glib.h (G_TRYLOCK): This of course should return TRUE in a + program with a thread-disabled GLib. + 1999-11-18 Tor Lillqvist * glib.def: g_strjoin was missing. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5da22a55..ba135d34 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +1999-11-25 Sebastian Wilhelmi + + * glib.h (G_TRYLOCK): This of course should return TRUE in a + program with a thread-disabled GLib. + 1999-11-18 Tor Lillqvist * glib.def: g_strjoin was missing. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5da22a55..ba135d34 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +1999-11-25 Sebastian Wilhelmi + + * glib.h (G_TRYLOCK): This of course should return TRUE in a + program with a thread-disabled GLib. + 1999-11-18 Tor Lillqvist * glib.def: g_strjoin was missing. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5da22a55..ba135d34 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +1999-11-25 Sebastian Wilhelmi + + * glib.h (G_TRYLOCK): This of course should return TRUE in a + program with a thread-disabled GLib. + 1999-11-18 Tor Lillqvist * glib.def: g_strjoin was missing. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5da22a55..ba135d34 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +1999-11-25 Sebastian Wilhelmi + + * glib.h (G_TRYLOCK): This of course should return TRUE in a + program with a thread-disabled GLib. + 1999-11-18 Tor Lillqvist * glib.def: g_strjoin was missing. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5da22a55..ba135d34 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +1999-11-25 Sebastian Wilhelmi + + * glib.h (G_TRYLOCK): This of course should return TRUE in a + program with a thread-disabled GLib. + 1999-11-18 Tor Lillqvist * glib.def: g_strjoin was missing. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5da22a55..ba135d34 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +1999-11-25 Sebastian Wilhelmi + + * glib.h (G_TRYLOCK): This of course should return TRUE in a + program with a thread-disabled GLib. + 1999-11-18 Tor Lillqvist * glib.def: g_strjoin was missing. diff --git a/glib.h b/glib.h index 616974c2..b94c9454 100644 --- a/glib.h +++ b/glib.h @@ -3124,7 +3124,7 @@ extern void glib_dummy_decl (void); # define G_LOCK_EXTERN(name) extern void glib_dummy_decl (void) # define G_LOCK(name) # define G_UNLOCK(name) -# define G_TRYLOCK(name) (FALSE) +# define G_TRYLOCK(name) (TRUE) #endif /* !G_THREADS_ENABLED */ #ifdef __cplusplus diff --git a/glib/glib.h b/glib/glib.h index 616974c2..b94c9454 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -3124,7 +3124,7 @@ extern void glib_dummy_decl (void); # define G_LOCK_EXTERN(name) extern void glib_dummy_decl (void) # define G_LOCK(name) # define G_UNLOCK(name) -# define G_TRYLOCK(name) (FALSE) +# define G_TRYLOCK(name) (TRUE) #endif /* !G_THREADS_ENABLED */ #ifdef __cplusplus -- 2.34.1