From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 30 Dec 2003 23:22:03 +0000 (+0000)
Subject: Removed redundant code from output.h
X-Git-Tag: v0.4.0~400
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0807ae51f046a8470289a0ef51cb5b22d46f6cd5;p=pspp-builds.git

Removed redundant code from output.h
---

diff --git a/src/ChangeLog b/src/ChangeLog
index df276bd0..cbf7e312 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 31 07:19:46 WST 2003 John Darrington <john@darrington.wattle.id.au>
+
+	* Removed redundant code from output.h
+
 Sat Dec 27 22:17:52 2003  Ben Pfaff  <blp@gnu.org>
 
 	Dictionary classes: each variable is "ordinary", "system", or
diff --git a/src/output.h b/src/output.h
index 98f8d4f1..bcd09328 100644
--- a/src/output.h
+++ b/src/output.h
@@ -29,31 +29,6 @@ struct rect
     int x2, y2;			/* Lower right, not part of the rectangle. */
   };
 
-#if 0
-#if __GNUC__ > 1 && defined(__OPTIMIZE__)
-extern inline int width (rect r) __attribute__ ((const));
-extern inline int height (rect r) __attribute__ ((const));
-
-extern inline int
-width (rect r)
-{
-  return r.x2 - r.x1 + 1;
-}
-
-extern inline int 
-height (rect r)
-{
-  return r.y2 - r.y1 + 1;
-}
-#else /* !__GNUC__ */
-/* Be carefull of these ... they use the argument more than once. */
-#define width(R) 				\
-	((R).x2 - (R).x1 + 1)
-#define height(R) 				\
-	((R).y2 - (R).y1 + 1)
-#endif /* !__GNUC__ */
-#endif
-
 /* Color descriptor. */
 struct color
   {