gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix strcasecmp() issues (again), see STR #2994.

Browse Source 
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
This commit is contained in:
Albrecht Schlosser 2014-01-21 11:07:43 +00:00
parent c4576badb8
commit 41b85d18a4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fluid/factory.cxx
View File

@ -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...
//

2
src/flstring.h
View File

@ -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