Replace inappropriate usage of __WATCOM__ with _MSC_VER.

Note: this is in parts temporary since some of the functions redefined
for Visual Studio will be replaced with fl_*() functions in later commits.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12498 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 13 insertions, 11 deletions

diff --git a/src/flstring.h b/src/flstring.h
index 98d1af0a6..0d865738a 100644
--- a/src/flstring.h
+++ b/src/flstring.h
@@ -39,18 +39,20 @@
 #    undef index
 #  endif /* index */
 
+/*
+ * 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...
+ */
+
+#  if defined(_MSC_VER)
+#    define strdup _strdup
+#  endif /* _MSC_VER */
+
 #  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...
- */
-#    if defined(_MSC_VER) /* Visual C++ aka Visual Studio */
-#      define strdup _strdup
-#    endif /* _MSC_VER */
-#  endif /* WIN32 */
+#  endif /* WIN32 && ... */
 
 #  ifdef __cplusplus
 extern "C" {
@@ -82,8 +84,8 @@ FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t);
 #  endif /* !HAVE_STRLCPY */
 
 /*
- * locale independent ascii compare, does not introduce locale 
- * pbs as w/  case cmp 
+ * Locale independent ASCII string compare function,
+ * does not introduce locale issues as with strcasecmp()
  */
 FL_EXPORT extern int fl_ascii_strcasecmp(const char *s, const char *t);