summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fl_font_x.cxx4
-rw-r--r--src/fl_set_fonts_x.cxx2
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;