Commit 185c1de5 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Merge from 2.4:

2004-05-10  Matthias Clasen  <mclasen@redhat.com>

	Merge from 2.4:

	* glib/gmain.c (block_source, unblock_source): Make these
	static.  (#142230, Morten Welinder)
parent b5456a91
2004-05-10 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:
* glib/gmain.c (block_source, unblock_source): Make these
static. (#142230, Morten Welinder)
2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated
......
2004-05-10 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:
* glib/gmain.c (block_source, unblock_source): Make these
static. (#142230, Morten Welinder)
2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated
......
2004-05-10 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:
* glib/gmain.c (block_source, unblock_source): Make these
static. (#142230, Morten Welinder)
2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated
......
2004-05-10 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:
* glib/gmain.c (block_source, unblock_source): Make these
static. (#142230, Morten Welinder)
2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated
......
2004-05-10 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:
* glib/gmain.c (block_source, unblock_source): Make these
static. (#142230, Morten Welinder)
2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated
......
......@@ -1859,7 +1859,7 @@ g_main_depth (void)
* we don't continually spin in the poll()
*/
/* HOLDS: source->context's lock */
void
static void
block_source (GSource *source)
{
GSList *tmp_list;
......@@ -1875,7 +1875,7 @@ block_source (GSource *source)
}
/* HOLDS: source->context's lock */
void
static void
unblock_source (GSource *source)
{
GSList *tmp_list;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment