mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-11-04 10:08:56 +01:00 
			
		
		
		
	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)
This commit is contained in:
		
				
					committed by
					
						
						Matthias Clasen
					
				
			
			
				
	
			
			
			
						parent
						
							b5456a91d7
						
					
				
				
					commit
					185c1de577
				
			@@ -1,3 +1,10 @@
 | 
			
		||||
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
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,10 @@
 | 
			
		||||
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
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,10 @@
 | 
			
		||||
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
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,10 @@
 | 
			
		||||
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
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,10 @@
 | 
			
		||||
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;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user