64-bit

src/sbbs3/fidodefs.h

@@ -77,7 +77,7 @@
 #endif
 
 typedef struct _PACK {				/* Fidonet Packet Header				*/
-    short orignode,					/* Origination Node of Packet			*/
+    int16_t orignode,					/* Origination Node of Packet			*/
           destnode,					/* Destination Node of Packet			*/
           year,						/* Year of Packet Creation e.g. 1995	*/
           month,					/* Month of Packet Creation 0-11		*/
@@ -95,16 +95,16 @@ typedef struct _PACK {				/* Fidonet Packet Header				*/
     uchar prodcode,					/* Product Code (00h is Fido)			*/
           sernum,					/* Binary Serial Number or NULL			*/
           password[FIDO_PASS_LEN];	/* Session Password or NULL				*/
-    short origzone,					/* Origination Zone of Packet or NULL	*/
+    int16_t origzone,					/* Origination Zone of Packet or NULL	*/
           destzone;					/* Destination Zone of Packet or NULL	*/
 	union {							
 		char padding[20];			/* Fill Characters (Type 2.0)			*/
 		struct {					/* OR Type 2+ Packet Header Info		*/
-			short auxnet,			/* Orig Net if Origin is a Point		*/
+			int16_t auxnet,			/* Orig Net if Origin is a Point		*/
 				  cwcopy;			/* Must be Equal to cword				*/
 			uchar prodcode, 		/* Product Code							*/
 				  revision; 		/* Revision								*/
-			short cword,			/* Compatibility Word					*/
+			int16_t cword,			/* Compatibility Word					*/
 				  origzone, 		/* Zone of Packet Sender or NULL		*/
 				  destzone, 		/* Zone of Packet Receiver or NULL		*/
 				  origpoint,		/* Origination Point of Packet			*/
@@ -124,13 +124,13 @@ typedef struct _PACK {				/* Fidonet Packet Header				*/
 #define FIDO_PACKET_TERMINATOR		0x0000	/* 16-bits */
 
 typedef struct _PACK {				/* FidoNet Packed Message Header 		*/
-	short	type;					/* Message type: 2						*/
-	short	orignode;
-	short	destnode;
-	short	orignet;
-	short	destnet;
-	short	attr;
-	short	cost;
+	int16_t	type;					/* Message type: 2						*/
+	int16_t	orignode;
+	int16_t	destnode;
+	int16_t	orignet;
+	int16_t	destnet;
+	int16_t	attr;
+	int16_t	cost;
 	char	time[FIDO_TIME_LEN];	/* Time in goof-ball ASCII format		*/
 } fpkdmsg_t;
 
@@ -142,7 +142,7 @@ typedef struct _PACK {				/* FidoNet Stored Message Header *.msg	*/
 			to[FIDO_NAME_LEN], 		/* To user								*/
 			subj[FIDO_SUBJ_LEN],	/* Message title						*/
 			time[FIDO_TIME_LEN];	/* Time in goof-ball ASCII format		*/
-	short	read,					/* Times read							*/
+	int16_t	read,					/* Times read							*/
 			destnode,				/* Destination node						*/
 			orignode,				/* Origin node							*/
 			cost,					/* Cost in pennies						*/

src/sbbs3/nodedefs.h

@@ -116,7 +116,7 @@ typedef struct _PACK {				/* Node information kept in node.dab */
     uchar   status,                 /* Current Status of Node */
             errors,                 /* Number of Critical Errors */
             action;                 /* Action User is doing on Node */
-    ushort  useron,                 /* User on Node */
+    uint16_t  useron,                 /* User on Node */
             connection,             /* Connection rate of Node */
 #define NODE_CONNECTION_LOCAL		0
 #define NODE_CONNECTION_TELNET		USHRT_MAX	/* 0xffff */
@@ -124,7 +124,7 @@ typedef struct _PACK {				/* Node information kept in node.dab */
 #define NODE_CONNECTION_SSH			(USHRT_MAX-2)
             misc,                   /* Miscellaneous bits for node */
             aux;                    /* Auxillary word for node */
-    ulong   extaux;                 /* Extended aux dword for node */
+    uint32_t   extaux;                 /* Extended aux dword for node */
             } node_t;
 
 #if defined(_WIN32) || defined(__BORLANDC__)

src/sbbs3/qwknodes.c

@@ -97,7 +97,7 @@ void bail(int code)
 char *loadmsgtail(smbmsg_t msg)
 {
 	char	*buf=NULL;
-	ushort	xlat;
+	uint16_t	xlat;
 	int 	i;
 	long	l=0,length;