win32: unify strcasecmp definitions

There was two incompatible definitions of strcasecmp, which lead to a
compiler warning. Let's clean this up by only leaving one of them, and
using that one all the time.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
index a86632c95e1b0714402441d406b99cc6339041dc..d2d87166b7b381dfc858a8dc4a9b1134f7e979ba 100644 (file)
--- a/src/compiler/glsl/glsl_parser.yy
+++ b/src/compiler/glsl/glsl_parser.yy
@@ -33,6 +33,7 @@
 #include "glsl_parser_extras.h"
 #include "compiler/glsl_types.h"
 #include "main/context.h"
+#include "util/u_string.h"
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4065 ) // switch statement contains 'default' but no 'case' labels

diff --git a/src/egl/main/egllog.c b/src/egl/main/egllog.c
index c223f49b0fed1e0e71cfb06aa56f597b84b22f42..6a91952577fd313e48eef710974b863efb5861d4 100644 (file)
--- a/src/egl/main/egllog.c
+++ b/src/egl/main/egllog.c
@@ -42,6 +42,7 @@
 #include <strings.h>
 #include "c11/threads.h"
 #include "util/macros.h"
+#include "util/u_string.h"
 
 #include "egllog.h"
 

diff --git a/src/gallium/auxiliary/hud/hud_diskstat.c b/src/gallium/auxiliary/hud/hud_diskstat.c
index 23b98c1fa86a69b1465913add59f15e13ccaef0f..b5d9710ef11e4690b6a8b50bd15489018ac56d58 100644 (file)
--- a/src/gallium/auxiliary/hud/hud_diskstat.c
+++ b/src/gallium/auxiliary/hud/hud_diskstat.c
@@ -37,6 +37,7 @@
 #include "util/os_time.h"
 #include "os/os_thread.h"
 #include "util/u_memory.h"
+#include "util/u_string.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>

diff --git a/src/gallium/auxiliary/hud/hud_nic.c b/src/gallium/auxiliary/hud/hud_nic.c
index 519a1aaeb11e64aef3f3f9635b750e478e033c8e..b10247e44751344e7465025600ed339e9916d0f8 100644 (file)
--- a/src/gallium/auxiliary/hud/hud_nic.c
+++ b/src/gallium/auxiliary/hud/hud_nic.c
@@ -37,6 +37,7 @@
 #include "util/os_time.h"
 #include "os/os_thread.h"
 #include "util/u_memory.h"
+#include "util/u_string.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>

diff --git a/src/gallium/auxiliary/hud/hud_sensors_temp.c b/src/gallium/auxiliary/hud/hud_sensors_temp.c
index fe80cabf82fb953af548f2b5e5c8360b3913a2cc..f99752f38df8e03879d91cf1e54f54af37b2edcd 100644 (file)
--- a/src/gallium/auxiliary/hud/hud_sensors_temp.c
+++ b/src/gallium/auxiliary/hud/hud_sensors_temp.c
@@ -34,6 +34,7 @@
 #include "util/os_time.h"
 #include "os/os_thread.h"
 #include "util/u_memory.h"
+#include "util/u_string.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index f461b1c052efdfd2e657e395a9bedf450b2aa650..41f28ad0f1ef78ca217e8704de3ff63915f8204a 100644 (file)
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -82,9 +82,6 @@ typedef union { GLfloat f; GLint i; GLuint u; } fi_type;
 
 
 
-#if defined(_MSC_VER)
-#define strcasecmp(s1, s2) _stricmp(s1, s2)
-#endif
 /*@}*/
 
 

diff --git a/src/util/debug.c b/src/util/debug.c
index d800481c847130b0693debc4a7125615b597b9f9..7079c61b7f4c22c0c0ed275f1b8d26179034b276 100644 (file)
--- a/src/util/debug.c
+++ b/src/util/debug.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include "main/macros.h"
 #include "debug.h"
+#include "u_string.h"
 
 uint64_t
 parse_debug_string(const char *debug,