From b53facde73d69b095dc001c22c167bbcacea3d9a Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Thu, 12 Dec 1991 14:15:14 +0000
Subject: [PATCH] removed macro defining ushort; gave clash with
 /usr/include/sys/types.h

---
 h/out.h | 103 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 50 insertions(+), 53 deletions(-)

diff --git a/h/out.h b/h/out.h
index 0834f665b..7386ec54d 100644
--- a/h/out.h
+++ b/h/out.h
@@ -9,93 +9,90 @@
 /*
  * output format for ACK assemblers
  */
-#ifndef ushort
-#define ushort	unsigned short
-#endif /* ushort */
 
 struct outhead {
-	ushort 	oh_magic;	/* magic number */
-	ushort 	oh_stamp;	/* version stamp */
-	ushort	oh_flags;	/* several format flags */
-	ushort	oh_nsect;	/* number of outsect structures */
-	ushort	oh_nrelo;	/* number of outrelo structures */
-	ushort	oh_nname;	/* number of outname structures */
-	long	oh_nemit;	/* sum of all os_flen */
-	long	oh_nchar;	/* size of string area */
+	unsigned short 	oh_magic;	/* magic number */
+	unsigned short 	oh_stamp;	/* version stamp */
+	unsigned short	oh_flags;	/* several format flags */
+	unsigned short	oh_nsect;	/* number of outsect structures */
+	unsigned short	oh_nrelo;	/* number of outrelo structures */
+	unsigned short	oh_nname;	/* number of outname structures */
+	long	oh_nemit;		/* sum of all os_flen */
+	long	oh_nchar;		/* size of string area */
 };
 
-#define O_MAGIC	0x0201		/* magic number of output file */
-#define	O_STAMP	0		/* version stamp */
-#define MAXSECT	64		/* Maximum number of sections */
+#define O_MAGIC	0x0201			/* magic number of output file */
+#define	O_STAMP	0			/* version stamp */
+#define MAXSECT	64			/* Maximum number of sections */
 
-#define	HF_LINK	0x0004		/* unresolved references left */
-#define	HF_8086	0x0008		/* os_base specially encoded */
+#define	HF_LINK	0x0004			/* unresolved references left */
+#define	HF_8086	0x0008			/* os_base specially encoded */
 
 struct outsect {
-	long 	os_base;	/* startaddress in machine */
-	long	os_size;	/* section size in machine */
-	long	os_foff;	/* startaddress in file */
-	long	os_flen;	/* section size in file */
-	long	os_lign;	/* section alignment */
+	long 	os_base;		/* startaddress in machine */
+	long	os_size;		/* section size in machine */
+	long	os_foff;		/* startaddress in file */
+	long	os_flen;		/* section size in file */
+	long	os_lign;		/* section alignment */
 };
 
 struct outrelo {
-	char	or_type;	/* type of reference */
-	char	or_sect;	/* referencing section */
-	ushort	or_nami;	/* referenced symbol index */
-	long	or_addr;	/* referencing address */
+	char	or_type;		/* type of reference */
+	char	or_sect;		/* referencing section */
+	unsigned short	or_nami;	/* referenced symbol index */
+	long	or_addr;		/* referencing address */
 };
 
 struct outname {
 	union {
-	  char	*on_ptr;	/* symbol name (in core) */
-	  long	on_off;		/* symbol name (in file) */
+	  char	*on_ptr;		/* symbol name (in core) */
+	  long	on_off;			/* symbol name (in file) */
 	}	on_u;
 #define on_mptr	on_u.on_ptr
 #define on_foff	on_u.on_off
-	ushort	on_type;	/* symbol type */
-	ushort	on_desc;	/* debug info */
-	long	on_valu;	/* symbol value */
+	unsigned short	on_type;	/* symbol type */
+	unsigned short	on_desc;	/* debug info */
+	long	on_valu;		/* symbol value */
 };
 
 /*
  * relocation type bits
  */
-#define RELSZ	0x07		/* relocation length */
-#define RELO1	   1		/* 1 byte */
-#define RELO2	   2		/* 2 bytes */
-#define RELO4	   4		/* 4 bytes */
-#define RELPC	0x08		/* pc relative */
-#define RELBR	0x10		/* High order byte lowest address. */
-#define RELWR	0x20		/* High order word lowest address. */
+#define RELSZ	0x07			/* relocation length */
+#define RELO1	   1			/* 1 byte */
+#define RELO2	   2			/* 2 bytes */
+#define RELO4	   4			/* 4 bytes */
+#define RELPC	0x08			/* pc relative */
+#define RELBR	0x10			/* High order byte lowest address. */
+#define RELWR	0x20			/* High order word lowest address. */
 
 /*
  * section type bits and fields
  */
-#define S_TYP	0x007F		/* undefined, absolute or relative */
-#define S_EXT	0x0080		/* external flag */
-#define S_ETC	0x7F00		/* for symbolic debug, bypassing 'as' */
+#define S_TYP	0x007F			/* undefined, absolute or relative */
+#define S_EXT	0x0080			/* external flag */
+#define S_ETC	0x7F00			/* for symbolic debug, bypassing 'as' */
 
 /*
  * S_TYP field values
  */
-#define S_UND	0x0000		/* undefined item */
-#define S_ABS	0x0001		/* absolute item */
-#define S_MIN	0x0002		/* first user section */
-#define S_MAX	(S_TYP-1)	/* last user section */
-#define S_CRS	S_TYP		/* on_valu is symbol index which contains value */
+#define S_UND	0x0000			/* undefined item */
+#define S_ABS	0x0001			/* absolute item */
+#define S_MIN	0x0002			/* first user section */
+#define S_MAX	(S_TYP-1)		/* last user section */
+#define S_CRS	S_TYP			/* on_valu is symbol index which contains value */
 
 /*
  * S_ETC field values
  */
-#define S_SCT	0x0100		/* section names */
-#define S_LIN	0x0200		/* hll source line item */
-#define S_FIL	0x0300		/* hll source file item */
-#define S_MOD	0x0400		/* ass source file item */
-#define S_COM	0x1000		/* Common name. */
-#define S_STB	0xe000		/* entries with any of these bits set are
-				   reserved for debuggers
-				*/
+#define S_SCT	0x0100			/* section names */
+#define S_LIN	0x0200			/* hll source line item */
+#define S_FIL	0x0300			/* hll source file item */
+#define S_MOD	0x0400			/* ass source file item */
+#define S_COM	0x1000			/* Common name. */
+#define S_STB	0xe000			/* entries with any of these bits set are
+					   reserved for debuggers
+					*/
 
 /*
  * structure format strings