diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-10-14 08:54:48 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-10-14 08:54:48 +0000 |
| commit | 6bfa08c63d75ea8883952dc1ea3a7da5f3da73c7 (patch) | |
| tree | a1ea37655507c89793278854c1cc5fbd254c5462 | |
| parent | ad967af70ca45c29411d6425b4027ef86276f597 (diff) | |
Fix conditional compilation under Windows.
Target of the condition was MS Visual Studio, hence the replacement
of "ifndef __WATCOMC__" with "#if defined(_MSC_VER)".
Tested under Windows with MinGW and Visual Studio 2015.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12495 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/flstring.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/flstring.h b/src/flstring.h index 57e913d13..98d1af0a6 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -3,7 +3,7 @@ * * Common string header file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2016 by Bill Spitzak and others. + * Copyright 1998-2017 by Bill Spitzak and others. * * This library is free software. Distribution and use rights are outlined in * the file "COPYING" which should have been included with this file. If this @@ -42,14 +42,14 @@ # 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 - * on Windows, which is supposed to be POSIX compliant... Some of these - * functions are also defined in ISO C99... +/* + * Visual C++ 2005 incorrectly displays a warning about the use of + * POSIX APIs on Windows, which is supposed to be POSIX compliant... + * Some of these functions are also defined in ISO C99... */ -# ifndef __WATCOMC__ +# if defined(_MSC_VER) /* Visual C++ aka Visual Studio */ # define strdup _strdup -# /* define unlink _unlink */ -# endif /* !__WATCOMC__ */ +# endif /* _MSC_VER */ # endif /* WIN32 */ # ifdef __cplusplus |