Attachment "strncasecmp.diff" to
ticket [2986105fff]
added by
brlcad
2010-04-13 03:33:21.
Index: tcl/win/tclWinPort.h
===================================================================
--- tcl/win/tclWinPort.h (revision 38448)
+++ tcl/win/tclWinPort.h (working copy)
@@ -48,8 +48,12 @@
* These string functions are not defined with the same names on Windows.
*/
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
+#ifndef strcasecmp
+# define strcasecmp stricmp
+#endif
+#ifndef strncasecmp
+# define strncasecmp strnicmp
+#endif
/*
* Need to block out these includes for building extensions with MetroWerks
@@ -301,7 +305,7 @@
*/
#ifndef S_IFLNK
-#define S_IFLNK 0120000 /* Symbolic Link */
+# define S_IFLNK 0120000 /* Symbolic Link */
#endif
#ifndef S_ISREG
@@ -353,11 +357,11 @@
*/
#ifndef MAXPATH
-#define MAXPATH MAX_PATH
+# define MAXPATH MAX_PATH
#endif /* MAXPATH */
#ifndef MAXPATHLEN
-#define MAXPATHLEN MAXPATH
+# define MAXPATHLEN MAXPATH
#endif /* MAXPATHLEN */
/*
@@ -378,13 +382,13 @@
*/
#if defined(_MSC_VER) || defined(__MINGW32__)
-# define environ _environ
-# define hypot _hypot
-# define exception _exception
-# undef EDEADLOCK
-# if defined(__MINGW32__) && !defined(__MSVCRT__)
-# define timezone _timezone
-# endif
+# define environ _environ
+# define hypot _hypot
+# define exception _exception
+# undef EDEADLOCK
+# if defined(__MINGW32__) && !defined(__MSVCRT__)
+# define timezone _timezone
+# endif
#endif /* _MSC_VER || __MINGW32__ */
/*
Index: tk/win/tkWinPort.h
===================================================================
--- tk/win/tkWinPort.h (revision 38448)
+++ tk/win/tkWinPort.h (working copy)
@@ -49,13 +49,19 @@
#endif
#ifdef _MSC_VER
-# define hypot _hypot
+# ifndef hypot
+# define hypot _hypot
+# endif
#endif /* _MSC_VER */
#ifndef __GNUC__
-# define strncasecmp strnicmp
-# define strcasecmp stricmp
-#endif
+# ifndef strcasecmp
+# define strcasecmp stricmp
+# endif
+# ifndef strncasecmp
+# define strncasecmp strnicmp
+# endif
+#endif /* __GNUC__ */
#define NBBY 8
