From: fred <fred>
Date: Sun, 22 Dec 1996 16:12:16 +0000 (+0000)
Subject: flower-1.0.17
X-Git-Tag: release/1.5.59~6506
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=299c24f8d1a0b13b68cd306ac105290518ceafc9;p=lilypond.git

flower-1.0.17
---

diff --git a/flower/compare.hh b/flower/compare.hh
index 40bc9d2951..f0e886e539 100644
--- a/flower/compare.hh
+++ b/flower/compare.hh
@@ -37,8 +37,8 @@ prefix one_operator(type, function, !=)\
 prefix one_operator(type, function, <)\
 prefix one_operator(type, function, <=)\
 gpp_minmax(type, prefix)\
-prefix inline type MAX(type t1, type t2) {  return (t1 > t2 )? t1 : t2; }\
-prefix inline type MIN(type t1, type t2) {  return (t1 < t2 )? t1 : t2; }\
+prefix inline type max(type t1, type t2) {  return (t1 > t2 )? t1 : t2; }\
+prefix inline type min(type t1, type t2) {  return (t1 < t2 )? t1 : t2; }\
   \
 prefix  bool operator<(type t1, type t2) /* stupid fix to allow ; */
      /**