From a3ccfb6ad8c7570506589da005aa34899982434d Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 13 Apr 2009 01:48:00 +0200 Subject: [PATCH] ZynAddSubFX/FLTK: fixed "long long" types Replaced "long long" types by simple "long" or "int". --- plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H | 2 +- plugins/zynaddsubfx/fltk/FL/Fl_Widget.H | 2 +- plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H index 80ee5b272..33e520a67 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H @@ -88,7 +88,7 @@ struct FL_EXPORT Fl_Menu_Item { void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;} void* user_data() const {return user_data_;} void user_data(void* v) {user_data_ = v;} - long argument() const {return (long long)user_data_;} + long argument() const {return (long)user_data_;} void argument(long v) {user_data_ = (void*)v;} int shortcut() const {return shortcut_;} void shortcut(int s) {shortcut_ = s;} diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Widget.H b/plugins/zynaddsubfx/fltk/FL/Fl_Widget.H index 9125a5762..09f93eccb 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Widget.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Widget.H @@ -155,7 +155,7 @@ public: void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;} void* user_data() const {return user_data_;} void user_data(void* v) {user_data_ = v;} - long argument() const {return (long long)user_data_;} + long argument() const {return (long)user_data_;} void argument(long v) {user_data_ = (void*)v;} Fl_When when() const {return (Fl_When)when_;} void when(uchar i) {when_ = i;} diff --git a/plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx b/plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx index a8eff89e0..f8a9cd7ee 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx @@ -114,7 +114,7 @@ fl_open_uri(const char *uri, char *msg, int msglen) { #ifdef WIN32 if (msg) snprintf(msg, msglen, "open %s", uri); - return (long long)ShellExecute(HWND_DESKTOP, "open", uri, NULL, NULL, SW_SHOW) > 32; + return (int)ShellExecute(HWND_DESKTOP, "open", uri, NULL, NULL, SW_SHOW) > 32; #elif defined(__APPLE__) char *argv[3]; // Command-line arguments