warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

XRogue: get rid of VOID as an alias for long.

Browse source 
Maybe some compilers in 1986 didn't handle void pointers well, but they
are no longer a concern.
This commit is contained in:
John "Elwin" Edwards 2016-03-07 20:44:01 -05:00
parent 090622896b
commit e9c84b2637
19 changed files with 57 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

10
xrogue/rogue.h
View file

@ -20,12 +20,8 @@
#include "config.h"
#endif
/*
* some compiler don't handle void pointers well so
*/
#include <assert.h>
#define reg register
#define VOID long
#undef lines
#define ENCREAD encread
#define ENCWRITE encwrite
@ -935,7 +931,7 @@ struct delayed_action {
int d_type;
void (*d_func)();
union {
VOID *vp;
void *vp;
int i;
} d_arg;
int d_time;
@ -1322,7 +1318,7 @@ int findmindex(char *name);
void fix_stick(struct object *cur);
void fright(struct thing *th);
void fumble(void);
void fuse(void (*dfunc)(), VOID *arg, int time, int type);
void fuse(void (*dfunc)(), void *arg, int time, int type);
void genmonsters(int least, bool treas);
coord get_coordinates(void);
bool get_dir(coord *direction);
@ -1452,7 +1448,7 @@ bool skirmish(struct thing *attacker, coord *mp, struct object *weap,
bool thrown);
struct linked_list *spec_item(int type, int which, int hit, int damage);
void spell_recovery(void);
void start_daemon(void (*dfunc)(), VOID *arg, int type);
void start_daemon(void (*dfunc)(), void *arg, int type);
void status(bool display);
void steal(void);
bool step_ok(int y, int x, int can_on_monst, struct thing *flgptr);