--- sbbs/src/sbbs3/fidodefs.h	2018/04/24 16:41:23	1.1
+++ sbbs/src/sbbs3/fidodefs.h	2018/04/24 16:43:14	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* FidoNet constants, macros, and structure definitions */
 
-/* $Id: fidodefs.h,v 1.1 2018/04/24 16:41:23 root Exp $ */
+/* $Id: fidodefs.h,v 1.1.1.2 2018/04/24 16:43:14 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2005 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2009 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -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		*/
@@ -87,24 +87,21 @@ typedef struct _PACK {				/* Fidonet Pac
           sec,						/* Second of Packet Creation 0-59		*/
           baud,						/* Max Baud Rate of Orig & Dest			*/
           pkttype,					/* Packet Type (-1 is obsolete)			*/
-#define PKT_TWO_PLUS	0			/* Type 2+ Packet Header				*/
-#define PKT_TWO_TWO 	1			/* Type 2.2 Packet Header				*/
-#define PKT_TWO 		2			/* Old Type Packet Header				*/
           orignet,					/* Origination Net of Packet			*/
           destnet;					/* Destination Net of Packet			*/
     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 +121,13 @@ typedef struct _PACK {				/* Fidonet Pac
 #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 +139,7 @@ typedef struct _PACK {				/* FidoNet Sto
 			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						*/