6 files changed, 24 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/draw/draw_unfilled.c b/src/gallium/auxiliary/draw/draw_unfilled.c
index 4d718d514c..b07860cd9e 100644
--- a/src/gallium/auxiliary/draw/draw_unfilled.c
+++ b/src/gallium/auxiliary/draw/draw_unfilled.c
@@ -129,7 +129,7 @@ static void unfilled_tri( struct draw_stage *stage,
       points( stage, header );
       break;
    default:
-      abort();
+      assert(0);
    }   
 }
 
diff --git a/src/gallium/auxiliary/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
index 7b3c030956..6255d716a6 100644
--- a/src/gallium/auxiliary/util/p_debug.c
+++ b/src/gallium/auxiliary/util/p_debug.c
@@ -57,12 +57,16 @@ int rpl_vsnprintf(char *, size_t, const char *, va_list);
 void debug_vprintf(const char *format, va_list ap)
 {
 #ifdef WIN32
+#ifndef WINCE
    /* EngDebugPrint does not handle float point arguments, so we need to use
     * our own vsnprintf implementation */
    char buf[512 + 1];
    rpl_vsnprintf(buf, sizeof(buf), format, ap);
    rpl_EngDebugPrint("%s", buf);
 #else
+   /* TODO: Implement debug print for WINCE */
+#endif
+#else
    vfprintf(stderr, format, ap);
 #endif
 }
@@ -80,8 +84,12 @@ void debug_printf(const char *format, ...)
 static INLINE void debug_abort(void) 
 {
 #ifdef WIN32
+#ifndef WINCE
    EngDebugBreak();
 #else
+   _asm {int 3};
+#endif
+#else
    abort();
 #endif
 }
diff --git a/src/gallium/drivers/softpipe/sp_quad_alpha_test.c b/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
index 4ffeac35e1..318916fe30 100644
--- a/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
+++ b/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
@@ -72,7 +72,7 @@ alpha_test_quad(struct quad_stage *qs, struct quad_header *quad)
       passMask = MASK_ALL;
       break;
    default:
-      abort();
+      assert(0);
    }
 
    quad->mask &= passMask;
diff --git a/src/gallium/drivers/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp_quad_blend.c
index 17f3ecd0b8..0b79cfa1ed 100644
--- a/src/gallium/drivers/softpipe/sp_quad_blend.c
+++ b/src/gallium/drivers/softpipe/sp_quad_blend.c
@@ -392,7 +392,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
       assert(0); /* to do */
       break;
    default:
-      abort();
+      assert(0);
    }
    
    /*
@@ -464,7 +464,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
       }
       break;
    default:
-      abort();
+      assert(0);
    }
    
    
@@ -716,7 +716,7 @@ blend_quad(struct quad_stage *qs, struct quad_header *quad)
       VEC4_MAX(quadColor[3], source[3], dest[3]); /* A */
       break;
    default:
-      abort();
+      assert(0);
    }
    
    /* pass blended quad to next stage */
diff --git a/src/gallium/drivers/softpipe/sp_quad_depth_test.c b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
index a9a0754f27..a1859f9883 100644
--- a/src/gallium/drivers/softpipe/sp_quad_depth_test.c
+++ b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
@@ -185,7 +185,7 @@ sp_depth_test_quad(struct quad_stage *qs, struct quad_header *quad)
       zmask = MASK_ALL;
       break;
    default:
-      abort();
+      assert(0);
    }
 
    quad->mask &= zmask;
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index 3b32ba1d24..ef36ce75f7 100644
--- a/src/gallium/include/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
@@ -54,7 +54,12 @@ EngFreeMem(
 static INLINE void *
 MALLOC( unsigned size )
 {
+#ifdef WINCE
+   /* TODO: Need to abstract this */
+   return malloc( size );
+#else
    return EngAllocMem( 0, size, 'D3AG' );
+#endif
 }
 
 static INLINE void *
@@ -71,7 +76,12 @@ static INLINE void
 FREE( void *ptr )
 {
    if( ptr ) {
+#ifdef WINCE
+      /* TODO: Need to abstract this */
+      free( ptr );
+#else
       EngFreeMem( ptr );
+#endif
    }
 }