Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove USHORT typedef. #457

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove USHORT typedef. #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 13 additions & 13 deletions inc/gcdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
/**********************************************************************/
#include "lispemul.h" /* for LispPTR, DLword */
#include "version.h" /* for USHORT */
#include "version.h" /* for BIGVM */
#include "gchtfinddefs.h"

#define ADDREF 0 /* for gclookup routine. */
Expand Down Expand Up @@ -163,10 +163,10 @@ struct htoverflow
#else
struct hashentry
{ /* GC hashtable entry */
USHORT count :6;
USHORT stackref :1;
USHORT segnum :8;
USHORT collision :1;
unsigned count :6;
unsigned stackref :1;
unsigned segnum :8;
unsigned collision :1;
};

struct htlinkptr
Expand Down Expand Up @@ -201,10 +201,10 @@ struct htoverflow
#ifdef BIGVM
struct hashentry
{ /* GC hashtable entry */
USHORT collision :1;
USHORT segnum :15;
USHORT stackref :1;
USHORT count :15;
unsigned collision :1;
unsigned segnum :15;
unsigned stackref :1;
unsigned count :15;
};

struct htlinkptr
Expand Down Expand Up @@ -232,10 +232,10 @@ struct htoverflow
#else
struct hashentry
{ /* GC hashtable entry */
USHORT collision :1;
USHORT segnum :8;
USHORT stackref :1;
USHORT count :6;
unsigned collision :1;
unsigned segnum :8;
unsigned stackref :1;
unsigned count :6;
};

struct htlinkptr
Expand Down
32 changes: 16 additions & 16 deletions inc/lispemul.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,22 +273,22 @@ struct state {

/* For bit test */
typedef struct wbits {
USHORT LSB : 1;
USHORT B14 : 1;
USHORT B13 : 1;
USHORT B12 : 1;
USHORT B11 : 1;
USHORT B10 : 1;
USHORT B9 : 1;
USHORT B8 : 1;
USHORT B7 : 1;
USHORT B6 : 1;
USHORT B5 : 1;
USHORT B4 : 1;
USHORT B3 : 1;
USHORT B2 : 1;
USHORT B1 : 1;
USHORT xMSB : 1;
unsigned LSB : 1;
unsigned B14 : 1;
unsigned B13 : 1;
unsigned B12 : 1;
unsigned B11 : 1;
unsigned B10 : 1;
unsigned B9 : 1;
unsigned B8 : 1;
unsigned B7 : 1;
unsigned B6 : 1;
unsigned B5 : 1;
unsigned B4 : 1;
unsigned B3 : 1;
unsigned B2 : 1;
unsigned B1 : 1;
unsigned xMSB : 1;
} WBITS;

typedef struct lbits {
Expand Down
6 changes: 3 additions & 3 deletions inc/stack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,9 @@ typedef struct basic_frame {
} Bframe;

typedef struct stkword {
USHORT usecount : 8;
USHORT nil : 5;
USHORT flags : 3;
unsigned usecount : 8;
unsigned nil : 5;
unsigned flags : 3;
} StackWord;

typedef struct stack_block {
Expand Down
3 changes: 0 additions & 3 deletions inc/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,6 @@ typedef unsigned char u_char;
typedef unsigned long u_int;
typedef unsigned short u_short;
#undef UNALIGNED_FETCH_OK
typedef unsigned USHORT;
#else
typedef unsigned short USHORT;
#endif /* DOS */

/****************************************************************/
Expand Down