From 33efff673a3b00f5aa7c85bcb40d3e2c5eb33ea1 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 30 Jul 2000 08:44:06 +0000 Subject: [PATCH] fix tor's recent changes which got rid of a required variable in the Sun Jul 30 10:44:16 2000 Tim Janik * gmain.c (g_get_current_time): fix tor's recent changes which got rid of a required variable in the non-windows path. --- 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/gmain.c | 2 ++ gmain.c | 2 ++ 10 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index b77004ddf..c2afe466b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 30 10:44:16 2000 Tim Janik + + * gmain.c (g_get_current_time): fix tor's recent changes which + got rid of a required variable in the non-windows path. + 2000-07-30 Tor Lillqvist Finally, a new and improved IO Channel and condition watch diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b77004ddf..c2afe466b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Jul 30 10:44:16 2000 Tim Janik + + * gmain.c (g_get_current_time): fix tor's recent changes which + got rid of a required variable in the non-windows path. + 2000-07-30 Tor Lillqvist Finally, a new and improved IO Channel and condition watch diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b77004ddf..c2afe466b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Jul 30 10:44:16 2000 Tim Janik + + * gmain.c (g_get_current_time): fix tor's recent changes which + got rid of a required variable in the non-windows path. + 2000-07-30 Tor Lillqvist Finally, a new and improved IO Channel and condition watch diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b77004ddf..c2afe466b 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Jul 30 10:44:16 2000 Tim Janik + + * gmain.c (g_get_current_time): fix tor's recent changes which + got rid of a required variable in the non-windows path. + 2000-07-30 Tor Lillqvist Finally, a new and improved IO Channel and condition watch diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b77004ddf..c2afe466b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Jul 30 10:44:16 2000 Tim Janik + + * gmain.c (g_get_current_time): fix tor's recent changes which + got rid of a required variable in the non-windows path. + 2000-07-30 Tor Lillqvist Finally, a new and improved IO Channel and condition watch diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b77004ddf..c2afe466b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Jul 30 10:44:16 2000 Tim Janik + + * gmain.c (g_get_current_time): fix tor's recent changes which + got rid of a required variable in the non-windows path. + 2000-07-30 Tor Lillqvist Finally, a new and improved IO Channel and condition watch diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b77004ddf..c2afe466b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Jul 30 10:44:16 2000 Tim Janik + + * gmain.c (g_get_current_time): fix tor's recent changes which + got rid of a required variable in the non-windows path. + 2000-07-30 Tor Lillqvist Finally, a new and improved IO Channel and condition watch diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b77004ddf..c2afe466b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Jul 30 10:44:16 2000 Tim Janik + + * gmain.c (g_get_current_time): fix tor's recent changes which + got rid of a required variable in the non-windows path. + 2000-07-30 Tor Lillqvist Finally, a new and improved IO Channel and condition watch diff --git a/glib/gmain.c b/glib/gmain.c index a3404a6e9..0258570f3 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -619,6 +619,8 @@ void g_get_current_time (GTimeVal *result) { #ifndef G_OS_WIN32 + struct timeval r; + g_return_if_fail (result != NULL); /*this is required on alpha, there the timeval structs are int's diff --git a/gmain.c b/gmain.c index a3404a6e9..0258570f3 100644 --- a/gmain.c +++ b/gmain.c @@ -619,6 +619,8 @@ void g_get_current_time (GTimeVal *result) { #ifndef G_OS_WIN32 + struct timeval r; + g_return_if_fail (result != NULL); /*this is required on alpha, there the timeval structs are int's