summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/compiler.h2
-rw-r--r--src/mesa/main/errors.c2
-rw-r--r--src/mesa/main/imports.c21
3 files changed, 1 insertions, 24 deletions
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
}
/*@}*/