From ba8a71589d5b745bce7f4b85b7c5caeef82cb1b3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 31 Aug 2000 21:58:59 +0000 Subject: [PATCH] glib.h No use for separate condition parameter. 2000-08-31 Tor Lillqvist * glib.h * giowin32.c (g_io_channel_win32_poll): No use for separate condition parameter. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ giowin32.c | 3 +-- glib.h | 1 - glib/giowin32.c | 3 +-- glib/glib.h | 1 - 12 files changed, 34 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2bd25cde3..b11a96559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-08-31 Tor Lillqvist + * glib.h + * giowin32.c (g_io_channel_win32_poll): No use for separate + condition parameter. + * gmain.c (g_get_current_time): (Win32): Simplify, use GetSystemTimeAsFileTime(). diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2bd25cde3..b11a96559 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,5 +1,9 @@ 2000-08-31 Tor Lillqvist + * glib.h + * giowin32.c (g_io_channel_win32_poll): No use for separate + condition parameter. + * gmain.c (g_get_current_time): (Win32): Simplify, use GetSystemTimeAsFileTime(). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2bd25cde3..b11a96559 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2000-08-31 Tor Lillqvist + * glib.h + * giowin32.c (g_io_channel_win32_poll): No use for separate + condition parameter. + * gmain.c (g_get_current_time): (Win32): Simplify, use GetSystemTimeAsFileTime(). diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2bd25cde3..b11a96559 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,9 @@ 2000-08-31 Tor Lillqvist + * glib.h + * giowin32.c (g_io_channel_win32_poll): No use for separate + condition parameter. + * gmain.c (g_get_current_time): (Win32): Simplify, use GetSystemTimeAsFileTime(). diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2bd25cde3..b11a96559 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,9 @@ 2000-08-31 Tor Lillqvist + * glib.h + * giowin32.c (g_io_channel_win32_poll): No use for separate + condition parameter. + * gmain.c (g_get_current_time): (Win32): Simplify, use GetSystemTimeAsFileTime(). diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2bd25cde3..b11a96559 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,9 @@ 2000-08-31 Tor Lillqvist + * glib.h + * giowin32.c (g_io_channel_win32_poll): No use for separate + condition parameter. + * gmain.c (g_get_current_time): (Win32): Simplify, use GetSystemTimeAsFileTime(). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2bd25cde3..b11a96559 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2000-08-31 Tor Lillqvist + * glib.h + * giowin32.c (g_io_channel_win32_poll): No use for separate + condition parameter. + * gmain.c (g_get_current_time): (Win32): Simplify, use GetSystemTimeAsFileTime(). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2bd25cde3..b11a96559 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2000-08-31 Tor Lillqvist + * glib.h + * giowin32.c (g_io_channel_win32_poll): No use for separate + condition parameter. + * gmain.c (g_get_current_time): (Win32): Simplify, use GetSystemTimeAsFileTime(). diff --git a/giowin32.c b/giowin32.c index 84c57276f..9db86d3ac 100644 --- a/giowin32.c +++ b/giowin32.c @@ -874,7 +874,6 @@ g_io_channel_win32_set_debug (GIOChannel *channel, gint g_io_channel_win32_poll (GPollFD *fds, gint n_fds, - GIOCondition condition, gint timeout) { int i; @@ -899,7 +898,7 @@ g_io_channel_win32_wait_for_condition (GIOChannel *channel, pollfd.fd = (gint) win32_channel->data_avail_event; pollfd.events = condition; - return g_io_channel_win32_poll (&pollfd, 1, condition, timeout); + return g_io_channel_win32_poll (&pollfd, 1, timeout); } /* This variable and the functions below are present just to be diff --git a/glib.h b/glib.h index 3b3b4c236..ded2c205e 100644 --- a/glib.h +++ b/glib.h @@ -2927,7 +2927,6 @@ gint g_io_channel_unix_get_fd (GIOChannel *channel); */ gint g_io_channel_win32_poll (GPollFD *fds, gint n_fds, - GIOCondition condition, gint timeout); /* This is used to add polling for Windows messages. GDK (GTk+) programs diff --git a/glib/giowin32.c b/glib/giowin32.c index 84c57276f..9db86d3ac 100644 --- a/glib/giowin32.c +++ b/glib/giowin32.c @@ -874,7 +874,6 @@ g_io_channel_win32_set_debug (GIOChannel *channel, gint g_io_channel_win32_poll (GPollFD *fds, gint n_fds, - GIOCondition condition, gint timeout) { int i; @@ -899,7 +898,7 @@ g_io_channel_win32_wait_for_condition (GIOChannel *channel, pollfd.fd = (gint) win32_channel->data_avail_event; pollfd.events = condition; - return g_io_channel_win32_poll (&pollfd, 1, condition, timeout); + return g_io_channel_win32_poll (&pollfd, 1, timeout); } /* This variable and the functions below are present just to be diff --git a/glib/glib.h b/glib/glib.h index 3b3b4c236..ded2c205e 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -2927,7 +2927,6 @@ gint g_io_channel_unix_get_fd (GIOChannel *channel); */ gint g_io_channel_win32_poll (GPollFD *fds, gint n_fds, - GIOCondition condition, gint timeout); /* This is used to add polling for Windows messages. GDK (GTk+) programs