Changeset 9b9efa2b

Timestamp:

Dec 21, 2010, 5:54:31 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

fa90c34

Parents:

e974152

git-author:

David Benjamin <davidben@mit.edu> (12/15/10 13:24:03)

git-committer:

David Benjamin <davidben@mit.edu> (12/21/10 17:54:31)

Message:

Punt owl_util_max and owl_util_min in favor of MAX and MIN

glib already provides those macros which we happily use outside of one
place.

Files:

• popwin.c (modified) (1 diff)
• util.c (modified) (1 diff)

popwin.c

@@ -39 +39 @@
   owl_window_get_position(parent, &glines, &gcols, 0, 0);
 
-  lines = owl_util_min(glines,24)*3/4 + owl_util_max(glines-24,0)/2;
+  lines = MIN(glines, 24) * 3/4 + MAX(glines - 24, 0) / 2;
   startline = (glines-lines)/2;
-  cols = owl_util_min(gcols,90)*15/16 + owl_util_max(gcols-90,0)/2;
+  cols = MIN(gcols, 90) * 15 / 16 + MAX(gcols - 90, 0) / 2;
   startcol = (gcols-cols)/2;
 

util.c

@@ -495 +495 @@
 }
 
-int owl_util_max(int a, int b)
-{
-  if (a>b) return(a);
-  return(b);
-}
-
-int owl_util_min(int a, int b)
-{
-  if (a<b) return(a);
-  return(b);
-}
-
 /* Return the base class or instance from a zephyr class, by removing
    leading `un' or trailing `.d'.