From: Benjamin Otte <otte@gnome.org>
Date: Fri, 16 Jan 2004 22:56:34 +0000 (+0000)
Subject: gst/gstclock.c: make it compile with gcc 2.95 again.
X-Git-Tag: BRANCH-RELEASE-0_7_4-ROOT~125
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b26be1ef6816b31050ebdcf68aea9fa6b3b0779d;p=platform%2Fupstream%2Fgstreamer.git

gst/gstclock.c: make it compile with gcc 2.95 again.

Original commit message from CVS:
2004-01-16  Benjamin Otte  <in7y118@public.uni-hamburg.de>

* gst/gstclock.c: (gst_clock_get_time):
make it compile with gcc 2.95 again.
Patch by Scott Wheeler
---

diff --git a/ChangeLog b/ChangeLog
index 0267ebd..183e7fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-16  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* gst/gstclock.c: (gst_clock_get_time):
+	  make it compile with gcc 2.95 again.
+	  Patch by Scott Wheeler
+
 2004-01-15  David Schleef  <ds@schleef.org>
 
 	* gst/gstcaps.h:
diff --git a/gst/gstclock.c b/gst/gstclock.c
index f8dbb20..a74adbe 100644
--- a/gst/gstclock.c
+++ b/gst/gstclock.c
@@ -602,23 +602,22 @@ GstClockTime
 gst_clock_get_time (GstClock *clock)
 {
   GstClockTime ret = G_GINT64_CONSTANT (0);
+  GstClockClass *cclass;
 
   g_return_val_if_fail (GST_IS_CLOCK (clock), G_GINT64_CONSTANT (0));
 
-    GstClockClass *cclass;
-
-    cclass = GST_CLOCK_GET_CLASS (clock);
+  cclass = GST_CLOCK_GET_CLASS (clock);
 
-    if (cclass->get_internal_time) {
-      ret = cclass->get_internal_time (clock) - clock->start_time;
-    }
-    /* make sure the time is increasing, else return last_time */
-    if ((gint64) ret < (gint64) clock->last_time) {
-      ret = clock->last_time;
-    }
-    else {
-      clock->last_time = ret;
-    }
+  if (cclass->get_internal_time) {
+    ret = cclass->get_internal_time (clock) - clock->start_time;
+  }
+  /* make sure the time is increasing, else return last_time */
+  if ((gint64) ret < (gint64) clock->last_time) {
+    ret = clock->last_time;
+  }
+  else {
+    clock->last_time = ret;
+  }
 
   return ret;
 }