diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-01-21 11:07:43 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-01-21 11:07:43 +0000 |
| commit | 41b85d18a4c6e7cb4dd31f05705368b4e20667de (patch) | |
| tree | 123cfe026224f4db79694a799c4ec7cba1ca4bea | |
| parent | c4576badb8c5a84829ba85f10330e1435c28b559 (diff) | |
Fix strcasecmp() issues (again), see STR #2994.
This new temporary fix improves handling of strcasecmp() for
CMake-generated Makefiles (cmake -G "MSYS Makefiles" ..).
For some unknown reason (maybe other compiler flags?) this showed
lots of *warnings* again. A better fix (replacing direct calls to
strcasecmp() with fl_strcasecmp() or similar will follow later.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10074 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fluid/factory.cxx | 7 | ||||
| -rw-r--r-- | src/flstring.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/fluid/factory.cxx b/fluid/factory.cxx index bb6ed2bb8..dca05a90b 100644 --- a/fluid/factory.cxx +++ b/fluid/factory.cxx @@ -44,8 +44,13 @@ extern Fl_Pixmap *pixmap[]; // until a better fix can be found. One way would be to rename this // local, static version of function strcasecmp()... // AlbrechtS, Jan 03, 2014, svn -r ~10044, see STR #2994 +// +// For some (yet unknown) reason the previous fix didn't work with +// CMake-generated MinGW (MSYS) Makefiles, hence we have to use +// !defined(__MINGW32__) instead of !defined(strcasecmp). +// AlbrechtS, Jan 21, 2014, svn -r ~10074, see STR #2994 -#if !HAVE_STRCASECMP && !defined(strcasecmp) +#if !HAVE_STRCASECMP && !defined(__MINGW32__) // // 'strcasecmp()' - Do a case-insensitive compare... // diff --git a/src/flstring.h b/src/flstring.h index 3f565a7c9..c575c2069 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -39,7 +39,7 @@ # undef index # endif /* index */ -# if defined(WIN32) && !defined(__CYGWIN__) +# if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__) # define strcasecmp(s,t) _stricmp((s), (t)) # define strncasecmp(s,t,n) _strnicmp((s), (t), (n)) /* Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs |