From: fred <fred>
Date: Wed, 18 Dec 1996 23:59:18 +0000 (+0000)
Subject: flower-1.0.15
X-Git-Tag: release/1.5.59~6561
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cc29d0a6268a678380eff5071e531012a35f8daa;p=lilypond.git

flower-1.0.15
---

diff --git a/flower/Variables.make b/flower/Variables.make
index e0f94d6555..83a740ac4a 100644
--- a/flower/Variables.make
+++ b/flower/Variables.make
@@ -1,13 +1,13 @@
 MAJVER=1
 MINVER=0
-PATCHLEVEL=14
+PATCHLEVEL=15
 
 PACKAGENAME=flower
 VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
 DNAME=$(PACKAGENAME)-$(VERSION)
 DEFINES=-DNDEBUG -O2
 #DEFINES=-g
-CXXFLAGS+=$(DEFINES)  -Wall -W -pedantic
+CXXFLAGS+=$(DEFINES)  -Wall -W 
 CXXVER=$(CXX) --version
 include Sources.make
 
diff --git a/flower/compare.hh b/flower/compare.hh
index df278a2bfb..40bc9d2951 100644
--- a/flower/compare.hh
+++ b/flower/compare.hh
@@ -19,7 +19,8 @@ operator op(type t1, type t2)\
      return (t1 opp t2) ? t1 :  t2;\
 }\
 
-#ifdef __GNUC__
+
+#if defined (__GNUG__) && ! defined (__STRICT_ANSI__)
 #define gpp_minmax(type, prefix)\
        prefix gpp_minmax_operator(type, <?, <)\
        prefix gpp_minmax_operator(type, >?, >)