Removed some unneeded preprocessor conditional code.

It was Windows CE stuff that hasn't been integrated into the sources tree yet.

diff --git a/include/config1.h b/include/config1.h
index 0f34f169297ae2c4210529640b67b9f094bb5679..2f485b2019565991db05ba8be719d0a06c13192b 100644 (file)
--- a/include/config1.h
+++ b/include/config1.h
@@ -122,11 +122,6 @@
 # define USE_STDARG
 # define NEED_VARARGS
 
-# ifdef UNDER_CE
-# define WIN_CE
-# define STRCMPI
-# endif 
-
 /* ARM - the processor; avoids conflict with ARM in hack.h */
 # ifdef ARM
 # undef ARM

diff --git a/include/global.h b/include/global.h
index 3b7c17af2d47e38291804b7f8d7518f351ed27b0..6b8781351b363f6806d18b3349d1ea2ab6a54cef 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -175,12 +175,8 @@ typedef xchar      boolean;                /* 0 or 1 */
 #endif
 
 #ifdef WIN32
-#ifdef WIN_CE
-#include "wceconf.h"
-#else
 #include "ntconf.h"
 #endif
-#endif
 
 /* Displayable name of this port; don't redefine if defined in *conf.h */
 #ifndef PORT_ID

diff --git a/src/files.c b/src/files.c
index 80dd8f03ccbb991f0b7da81764a68cbd8defef25..3d343a948ab3a71ae1c539b6f70935abfbf62c2b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -99,10 +99,8 @@ static int lockptr;
 #define Delay(a) msleep(a)
 # endif
 #define Close close
-#ifndef WIN_CE
 #define DeleteFile unlink
 #endif
-#endif
 
 #ifdef USER_SOUNDS
 extern int FDECL(add_sound_mapping, (const char* mapping));

diff --git a/src/mklev.c b/src/mklev.c
index 6275821a4d0b4fc387de609c7b1288ebd76407fc..f25f92c9e066ae3c703fe54fc2ceeb7f55f05b9f 100644 (file)
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -35,11 +35,7 @@ STATIC_DCL boolean FDECL(place_niche,(struct mkroom *,int*,int*,int*));
 STATIC_DCL void FDECL(makeniche,(int));
 STATIC_DCL void NDECL(make_niches);
 
-#ifdef WIN_CE
-static int __cdecl do_comp(const void *vx, const void *vy);
-#else
 STATIC_PTR int FDECL(do_comp,(const genericptr,const genericptr));
-#endif
 
 STATIC_DCL void FDECL(dosdoor,(XCHAR_P,XCHAR_P,struct mkroom *,int));
 STATIC_DCL void FDECL(join,(int,int,BOOLEAN_P));
@@ -59,14 +55,10 @@ static boolean made_branch; /* used only during level creation */
 
 /* Args must be (const genericptr) so that qsort will always be happy. */
 
-#ifdef WIN_CE
-static int __cdecl do_comp(const void *vx, const void *vy)
-#else
 STATIC_PTR int
 do_comp(vx,vy)
 const genericptr vx;
 const genericptr vy;
-#endif
 {
 #ifdef LINT
 /* lint complains about possible pointer alignment problems, but we know
@@ -118,11 +110,7 @@ sort_rooms()
 #if defined(SYSV) || defined(DGUX)
        qsort((genericptr_t) rooms, (unsigned)nroom, sizeof(struct mkroom), do_comp);
 #else
-# if defined(WIN_CE)
-       qsort((genericptr_t) rooms, (unsigned)nroom, sizeof(struct mkroom), (int (__cdecl*)(const void *, const void *))do_comp);
-# else
        qsort((genericptr_t) rooms, nroom, sizeof(struct mkroom), do_comp);
-# endif
 #endif
 }