diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 04:33:54 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 04:33:54 +0000 |
| commit | 0a6be0a83f368aff7df7e1a9c567d7e16b92a579 (patch) | |
| tree | 0fff69bdb746415afd1449a5e9afc216261fdd2e /test/utf8.cxx | |
| parent | 642187dc1c99cc041f181438473cda8894564c8b (diff) | |
Fix compiler warnings (STR 2988), porting from branch-1.3.
This commit is the accumulated patch introduced in branch 1.3
in svn r 11094, 11095, and 11096.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11097 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test/utf8.cxx')
| -rw-r--r-- | test/utf8.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/utf8.cxx b/test/utf8.cxx index 038ebf1f8..b2c40fcb9 100644 --- a/test/utf8.cxx +++ b/test/utf8.cxx @@ -3,7 +3,7 @@ // // UTF-8 test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2016 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -421,7 +421,7 @@ int make_font_chooser(void) // font_count = Fl::set_fonts("*"); #ifdef WIN32 font_count = Fl::set_fonts("*"); -#elif __APPLE__ +#elif defined(__APPLE__) font_count = Fl::set_fonts("*"); #else // Load the systems available fonts - ask for everything that claims to be @@ -582,7 +582,7 @@ int main(int argc, char** argv) Fl::set_font(extra_font, #ifdef WIN32 " Arial Unicode MS" -#elif __APPLE__ +#elif defined(__APPLE__) "Monaco" #else "-*-*-*-*-*-*-*-*-*-*-*-*-iso10646-1" |