diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-27 14:10:29 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-27 14:10:29 +0000 |
| commit | c0a760d1c6ee5dc5742c545586d5d53332dcf42d (patch) | |
| tree | c33f411e52b13a494a9ffaef82a74317b509daa8 | |
| parent | c71a9e1c545d6dc0d9ea378eed8688ec21026b45 (diff) | |
Rename variable 'inp' because of colliding definition in Cygwin.
Although this is probably not the application's fault and this
was found with gcc 4.5.3 using Windows 64-bit cross-compiling only.
windowfocus.cxx:25:18: error: 'Fl_Input* inp' redeclared as different kind of symbol
/usr/x86_64-w64-mingw32/sys-root/mingw/include/intrin.h:347:5: error: previous declaration of 'int inp(short unsigned int)'
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10594 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | test/windowfocus.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/windowfocus.cxx b/test/windowfocus.cxx index 39ca21c8b..87238e69a 100644 --- a/test/windowfocus.cxx +++ b/test/windowfocus.cxx @@ -3,7 +3,7 @@ // // Cross-window show/focus test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2014 by Bill Spitzak and others. +// Copyright 1998-2015 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 @@ -22,7 +22,7 @@ #include <FL/Fl_Input.H> static Fl_Double_Window *win1, *win2; -static Fl_Input *inp; +static Fl_Input *input1; static void popup(Fl_Widget *, void *) { @@ -30,7 +30,7 @@ static void popup(Fl_Widget *, void *) { win2->show(); win2->wait_for_expose(); - inp->take_focus(); + input1->take_focus(); } int main(int argc, char **argv) { @@ -44,9 +44,9 @@ int main(int argc, char **argv) { "and you should be able to continue typing."); b->align(FL_ALIGN_WRAP | FL_ALIGN_LEFT | FL_ALIGN_INSIDE); - inp = new Fl_Input(10, 150, 150, 25); - inp->when(FL_WHEN_CHANGED); - inp->callback(popup); + input1 = new Fl_Input(10, 150, 150, 25); + input1->when(FL_WHEN_CHANGED); + input1->callback(popup); win1->end(); |