diff options
| author | Erik Faye-Lund <[email protected]> | 2019-08-08 14:08:16 +0200 |
|---|---|---|
| committer | Erik Faye-Lund <[email protected]> | 2019-08-15 20:23:44 +0200 |
| commit | 544b0886165ff891bda59f9bd4ec058f8af53e5a (patch) | |
| tree | f2e91711e4a9ce1f3c7d47b0509360ead5a63c57 | |
| parent | ecd312be96d417e70eaf4717fe64912ecbe8f713 (diff) | |
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 <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/compiler/glsl/glsl_parser.yy | 1 | ||||
| -rw-r--r-- | src/egl/main/egllog.c | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/hud/hud_diskstat.c | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/hud/hud_nic.c | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/hud/hud_sensors_temp.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/imports.h | 3 | ||||
| -rw-r--r-- | src/util/debug.c | 1 |
7 files changed, 6 insertions, 3 deletions
diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index a86632c95e1..d2d87166b7b 100644 --- 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 c223f49b0fe..6a91952577f 100644 --- 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 23b98c1fa86..b5d9710ef11 100644 --- 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 519a1aaeb11..b10247e4475 100644 --- 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 fe80cabf82f..f99752f38df 100644 --- 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 f461b1c052e..41f28ad0f1e 100644 --- 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 d800481c847..7079c61b7f4 100644 --- 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, |