Removed some unneeded preprocessor conditional code.
It was Windows CE stuff that hasn't been integrated into the sources tree yet.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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));
|
||||
|
||||
12
src/mklev.c
12
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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user