From 9499d6e358786f1ed3ed79e16fd301106cd08ddd Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 21 Sep 2014 22:57:10 -0700 Subject: [PATCH] mesa: Unifdef _WIN32_WCE. Reviewed-by: Ian Romanick Reviewed-by: Jose Fonseca Reviewed-by: Emil Velikov --- src/gallium/auxiliary/util/u_snprintf.c | 9 --------- src/gallium/state_trackers/egl/x11/glcore.h | 2 -- src/mapi/glapi/gen/gl_gentable.py | 2 +- src/mapi/glapi/glapi_nop.c | 4 +--- src/mesa/main/compiler.h | 2 -- src/mesa/main/errors.c | 2 +- src/mesa/main/imports.c | 21 --------------------- 7 files changed, 3 insertions(+), 39 deletions(-) diff --git a/src/gallium/auxiliary/util/u_snprintf.c b/src/gallium/auxiliary/util/u_snprintf.c index a24b6ff38db..7a2bf2a6f78 100644 --- a/src/gallium/auxiliary/util/u_snprintf.c +++ b/src/gallium/auxiliary/util/u_snprintf.c @@ -334,15 +334,6 @@ static void *mymemcpy(void *, void *, size_t); #endif /* HAVE_UINTPTR_T || defined(uintptr_t) */ #endif /* !defined(UINTPTR_T) */ -/* WinCE5.0 does not have uintptr_t defined */ -#if (_WIN32_WCE < 600) -#ifdef UINTPTR_T -#undef UINTPTR_T -#endif -#define UINTPTR_T unsigned long int -#endif - - /* Support for ptrdiff_t. */ #ifndef PTRDIFF_T #if HAVE_PTRDIFF_T || defined(ptrdiff_t) diff --git a/src/gallium/state_trackers/egl/x11/glcore.h b/src/gallium/state_trackers/egl/x11/glcore.h index 547b1113707..99de6c097f4 100644 --- a/src/gallium/state_trackers/egl/x11/glcore.h +++ b/src/gallium/state_trackers/egl/x11/glcore.h @@ -31,9 +31,7 @@ * Silicon Graphics, Inc. */ -#if !defined(_WIN32_WCE) #include -#endif #define GL_CORE_SGI 1 #define GL_CORE_MESA 2 diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py index ce9af99d50c..deffcee4d17 100644 --- a/src/mapi/glapi/gen/gl_gentable.py +++ b/src/mapi/glapi/gen/gl_gentable.py @@ -42,7 +42,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i #endif #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ - || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) + || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) #define USE_BACKTRACE #endif diff --git a/src/mapi/glapi/glapi_nop.c b/src/mapi/glapi/glapi_nop.c index 2597c8cb8f2..628276e932b 100644 --- a/src/mapi/glapi/glapi_nop.c +++ b/src/mapi/glapi/glapi_nop.c @@ -63,7 +63,7 @@ _glapi_set_warning_func(_glapi_proc func) static int Warn(const char *func) { -#if defined(DEBUG) && !defined(_WIN32_WCE) +#if defined(DEBUG) if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) { fprintf(stderr, "GL User Error: gl%s called without a rendering context\n", func); @@ -103,11 +103,9 @@ NoOpUnused(void) static int NoOpGeneric(void) { -#if !defined(_WIN32_WCE) if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) { fprintf(stderr, "GL User Error: calling GL function without a rendering context\n"); } -#endif return 0; } diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 813bf1905f5..185c911ab22 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -214,13 +214,11 @@ static inline GLuint CPU_TO_LE32(GLuint x) /** * ASSERT macro */ -#if !defined(_WIN32_WCE) #if defined(DEBUG) # define ASSERT(X) assert(X) #else # define ASSERT(X) #endif -#endif /* diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index 9cde1e02004..995fc820506 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -1194,7 +1194,7 @@ output_if_debug(const char *prefixString, const char *outputString, fprintf(fout, "\n"); fflush(fout); -#if defined(_WIN32) && !defined(_WIN32_WCE) +#if defined(_WIN32) /* stderr from windows applications without console is not usually * visible, so communicate with the debugger instead */ { diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 5809a621d4a..b8ec2e78550 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -485,24 +485,7 @@ void * _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *) ) { -#if defined(_WIN32_WCE) - void *mid; - int cmp; - while (nmemb) { - nmemb >>= 1; - mid = (char *)base + nmemb * size; - cmp = (*compar)(key, mid); - if (cmp == 0) - return mid; - if (cmp > 0) { - base = (char *)mid + size; - --nmemb; - } - } - return NULL; -#else return bsearch(key, base, nmemb, size, compar); -#endif } /*@}*/ @@ -518,11 +501,7 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size, char * _mesa_getenv( const char *var ) { -#if defined(_WIN32_WCE) - return NULL; -#else return getenv(var); -#endif } /*@}*/ -- 2.30.2