From ff1d7b6dad3d6fb3301a1d5b55a2febc2d3bba49 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Wed, 15 Dec 2010 13:54:34 +0000
Subject: Removed compilation warnings.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8037 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/fl_font_x.cxx      | 4 ++--
 src/fl_set_fonts_x.cxx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx
index 26a07d66a..8ac870d79 100644
--- a/src/fl_font_x.cxx
+++ b/src/fl_font_x.cxx
@@ -160,8 +160,8 @@ static const char *find_best_font(const char *fname, int size) {
       name = namebuffer;
       ptsize = size;
     } else if (!ptsize ||	// no fonts yet
-	       thissize < ptsize && ptsize > size || // current font too big
-	       thissize > ptsize && thissize <= size // current too small
+	       (thissize < ptsize && ptsize > size) || // current font too big
+	       (thissize > ptsize && thissize <= size) // current too small
       ) {
       name = thisname;
       ptsize = thissize;
diff --git a/src/fl_set_fonts_x.cxx b/src/fl_set_fonts_x.cxx
index 3172b098c..98f6095f3 100644
--- a/src/fl_set_fonts_x.cxx
+++ b/src/fl_set_fonts_x.cxx
@@ -260,7 +260,7 @@ static int to_canonical(char *to, const char *from, size_t tolen) {
 static unsigned int fl_free_font = FL_FREE_FONT;
 
 Fl_Font Fl::set_fonts(const char* xstarname) {
-  if (fl_free_font > FL_FREE_FONT) // already been here
+  if (fl_free_font > (unsigned)FL_FREE_FONT) // already been here
     return (Fl_Font)fl_free_font;
   fl_open_display();
   int xlistsize;
-- 
cgit v1.2.3