fix tor's recent changes which got rid of a required variable in the

Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>

        * gmain.c (g_get_current_time): fix tor's recent changes which
        got rid of a required variable in the non-windows path.

diff --git a/ChangeLog b/ChangeLog
index b77004ddf07fcc1c4e25d6a9a99e2dbe3a110204..c2afe466bbaaaf585235f765a9bff4525bcf5149 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>
+
+       * 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  <tml@iki.fi>
 
        Finally, a new and improved IO Channel and condition watch

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b77004ddf07fcc1c4e25d6a9a99e2dbe3a110204..c2afe466bbaaaf585235f765a9bff4525bcf5149 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>
+
+       * 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  <tml@iki.fi>
 
        Finally, a new and improved IO Channel and condition watch

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b77004ddf07fcc1c4e25d6a9a99e2dbe3a110204..c2afe466bbaaaf585235f765a9bff4525bcf5149 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>
+
+       * 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  <tml@iki.fi>
 
        Finally, a new and improved IO Channel and condition watch

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b77004ddf07fcc1c4e25d6a9a99e2dbe3a110204..c2afe466bbaaaf585235f765a9bff4525bcf5149 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>
+
+       * 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  <tml@iki.fi>
 
        Finally, a new and improved IO Channel and condition watch

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b77004ddf07fcc1c4e25d6a9a99e2dbe3a110204..c2afe466bbaaaf585235f765a9bff4525bcf5149 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>
+
+       * 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  <tml@iki.fi>
 
        Finally, a new and improved IO Channel and condition watch

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b77004ddf07fcc1c4e25d6a9a99e2dbe3a110204..c2afe466bbaaaf585235f765a9bff4525bcf5149 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>
+
+       * 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  <tml@iki.fi>
 
        Finally, a new and improved IO Channel and condition watch

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b77004ddf07fcc1c4e25d6a9a99e2dbe3a110204..c2afe466bbaaaf585235f765a9bff4525bcf5149 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>
+
+       * 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  <tml@iki.fi>
 
        Finally, a new and improved IO Channel and condition watch

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b77004ddf07fcc1c4e25d6a9a99e2dbe3a110204..c2afe466bbaaaf585235f765a9bff4525bcf5149 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Jul 30 10:44:16 2000  Tim Janik  <timj@gtk.org>
+
+       * 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  <tml@iki.fi>
 
        Finally, a new and improved IO Channel and condition watch

diff --git a/glib/gmain.c b/glib/gmain.c
index a3404a6e949507e6b04689e75c7661da92e7f71b..0258570f3cc5f1232c80cd19aae790441790a80f 100644 (file)
--- 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 a3404a6e949507e6b04689e75c7661da92e7f71b..0258570f3cc5f1232c80cd19aae790441790a80f 100644 (file)
--- 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