From d140f4f3be96f7002c6d8a50d72f11baa92509d1 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Mon, 7 Feb 2011 16:04:59 +0000
Subject: Fix STR #2557.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8398 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/fl_draw.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx
index 90a9a0aab..83c9b7428 100644
--- a/src/fl_draw.cxx
+++ b/src/fl_draw.cxx
@@ -3,7 +3,7 @@
 //
 // Label drawing code for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2011 by Bill Spitzak and others.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -32,7 +32,6 @@
 // Expands all unprintable characters to ^X or \nnn notation
 // Aligns them against the inside of the box.
 
-#define min(a,b) ((a)<(b)?(a):(b))
 #include <FL/fl_utf8.h>
 #include <FL/Fl.H>
 #include <FL/fl_draw.H>
@@ -216,12 +215,12 @@ void fl_draw(
            *symptr++ = *str++);
       *symptr = '\0';
       if (isspace(*str)) str++;
-      symwidth[0] = min(w,h);
+      symwidth[0] = (w < h ? w : h);
     }
 
     if (str && (p = strrchr(str, '@')) != NULL && p > (str + 1) && p[-1] != '@') {
       strlcpy(symbol[1], p, sizeof(symbol[1]));
-      symwidth[1] = min(w,h);
+      symwidth[1] = (w < h ? w : h);
     }
   }
 
-- 
cgit v1.2.3