diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-05-22 13:36:40 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-05-22 13:36:40 +0000 |
| commit | ffbcd89b539bb7d9440f9acc5622107a569b2421 (patch) | |
| tree | f2c6b9bf794fb2c9819337c4d4b509cc02055cf1 | |
| parent | 867e640cb836f4a54141541536222c6304a7d2ed (diff) | |
Fix compiler warnings.
FL/platform_types.h: C++ style comments are not allowed in ISO C90.
src/Fl_Help_View.cxx: type qualifiers ignored on function return type.
src/Fl_Image_Surface.cxx: (Linux) converting to non-pointer type
‘long unsigned int’ from NULL [-Wconversion-null]
Line #70: In member function ‘Fl_Offscreen Fl_Image_Surface::offscreen()’
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11748 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/platform_types.h | 2 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Image_Surface.cxx | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/FL/platform_types.h b/FL/platform_types.h index 7cdb8e4e3..3d812922e 100644 --- a/FL/platform_types.h +++ b/FL/platform_types.h @@ -62,7 +62,7 @@ typedef int FL_SOCKET; typedef NSOpenGLContext* GLContext; #elif defined(__cplusplus) typedef class NSOpenGLContext* GLContext; -#endif // __OBJC__ +#endif /* __OBJC__ */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 223064bfb..71ceb0790 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -313,7 +313,7 @@ public: int width() { return (int)fl_width(buf_); } char & operator[] (int idx) { return buf_[idx]; } - char const operator[] (int idx) const { return buf_[idx]; } + char operator[] (int idx) const { return buf_[idx]; } #if (DEBUG_EDIT_BUFFER) void print(const char *text = ""); diff --git a/src/Fl_Image_Surface.cxx b/src/Fl_Image_Surface.cxx index ab1248cc6..d26a53600 100644 --- a/src/Fl_Image_Surface.cxx +++ b/src/Fl_Image_Surface.cxx @@ -67,7 +67,9 @@ void Fl_Image_Surface::untranslate() { } /** Returns the Fl_Offscreen object associated to the image surface */ -Fl_Offscreen Fl_Image_Surface::offscreen() {return platform_surface? platform_surface->offscreen : NULL;} +Fl_Offscreen Fl_Image_Surface::offscreen() { + return platform_surface ? platform_surface->offscreen : (Fl_Offscreen)0; +} int Fl_Image_Surface::printable_rect(int *w, int *h) {return platform_surface->printable_rect(w, h);} |