From d67e9ccb73bff691d5e5ae53fab64206558c3069 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 27 Feb 2016 17:27:21 +0000 Subject: Fix compiler warnings (STR #2988) - final commit. This commit includes all fixes from branch-1.3 (svn r 11243) and additional fixes for warnings that crept in during the porting efforts, particularly C++ ("//") comments in C and included header files, and some more. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11246 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Printer.H | 2 +- FL/fl_utf8.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'FL') diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H index 214165092..cdc4fd319 100644 --- a/FL/Fl_Printer.H +++ b/FL/Fl_Printer.H @@ -103,7 +103,7 @@ protected: #endif -#if defined(FL_DOXYGEN) || !(__APPLE__ || WIN32 || FL_PORTING) +#if defined(FL_DOXYGEN) || !(defined(__APPLE__) || defined(WIN32) || defined(FL_PORTING)) /** Print support under Unix/Linux. diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h index e1dc45bdc..306cf3c58 100644 --- a/FL/fl_utf8.h +++ b/FL/fl_utf8.h @@ -53,7 +53,7 @@ # undef chdir # define chdir _chdir # endif -#elif defined(__APPLE__) // PORTME: should not be in the header +#elif defined(__APPLE__) /* PORTME: should not be in the header */ # include # include # define xchar wchar_t @@ -130,7 +130,7 @@ FL_EXPORT unsigned fl_utf8toa (const char *src, unsigned srclen, char *dst, unsi FL_EXPORT unsigned fl_utf8froma (char *dst, unsigned dstlen, const char *src, unsigned srclen); /* F2: Returns true if the current O/S locale is UTF-8 */ -FL_EXPORT int fl_utf8locale(); +FL_EXPORT int fl_utf8locale(void); /* F2: Examine the first len characters of src, to determine if the input text is UTF-8 or not * NOTE: The value returned is not simply boolean - it contains information about the probable @@ -164,12 +164,12 @@ FL_EXPORT char *fl_utf8_to_locale(const char *s, int len, unsigned int codepage) /* OD: Attempt to convert a string in the current locale to UTF-8 */ FL_EXPORT char *fl_locale_to_utf8(const char *s, int len, unsigned int codepage); -#elif defined(__APPLE__) // PORTME: Fl_Screen_Driver ? - platform text encoding and conversion - // not needed +#elif defined(__APPLE__) /* PORTME: Fl_Screen_Driver ? - platform text encoding and conversion */ + /* not needed */ #elif defined(FL_PORTING) # pragma message "FL_PORTING: do you want to be able to convert from a local charset to utf8?" -#else // X11 - // not needed +#else /* X11 */ + /* not needed */ #endif /***************************************************************************** -- cgit v1.2.3