aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorJohn Gilmore <gnu@cygnus>1993-06-18 10:29:14 +0000
committerJohn Gilmore <gnu@cygnus>1993-06-18 10:29:14 +0000
commit933ae8d4fd6c33bf7eb407ed9c03dc103c0c4962 (patch)
tree1649cb490941197269ecad4ea0733b067028879b /bfd
parent34dd8ba311511fc58f47fb977d099ad01c71a9e6 (diff)
downloadgdb-933ae8d4fd6c33bf7eb407ed9c03dc103c0c4962.zip
gdb-933ae8d4fd6c33bf7eb407ed9c03dc103c0c4962.tar.gz
gdb-933ae8d4fd6c33bf7eb407ed9c03dc103c0c4962.tar.bz2
Eliminate "int8_type", "int16_type", "int32_type", and their
variants from the BFD universe. Leave the 64-bit types for now, since they are in flux. * hosts/*.h: Remove declarations of all these types.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/hosts/alphaosf.h23
-rw-r--r--bfd/hosts/amix.h16
-rw-r--r--bfd/hosts/apollo68.h16
-rw-r--r--bfd/hosts/apollov68.h16
-rw-r--r--bfd/hosts/delta88.h16
-rw-r--r--bfd/hosts/dose.h16
-rw-r--r--bfd/hosts/go32.h16
-rw-r--r--bfd/hosts/harris.h14
-rw-r--r--bfd/hosts/hp300.h16
-rw-r--r--bfd/hosts/hppabsd.h15
-rw-r--r--bfd/hosts/hppahpux.h16
-rw-r--r--bfd/hosts/i386aix.h16
-rw-r--r--bfd/hosts/i386isc.h16
-rw-r--r--bfd/hosts/i386mach.h15
-rw-r--r--bfd/hosts/i386v.h16
-rw-r--r--bfd/hosts/i386v4.h16
-rw-r--r--bfd/hosts/irix3.h16
-rw-r--r--bfd/hosts/irix4.h16
-rw-r--r--bfd/hosts/ncr3000.h16
-rw-r--r--bfd/hosts/rs6000.h16
-rw-r--r--bfd/hosts/rtbsd.h16
-rw-r--r--bfd/hosts/sparc-ll.h32
-rw-r--r--bfd/hosts/std-host.h48
-rw-r--r--bfd/hosts/stratus.h16
-rw-r--r--bfd/hosts/sun3.h16
-rw-r--r--bfd/hosts/sysv4.h16
-rw-r--r--bfd/hosts/ultra3.h15
-rw-r--r--bfd/hosts/we32k.h16
28 files changed, 13 insertions, 485 deletions
diff --git a/bfd/hosts/alphaosf.h b/bfd/hosts/alphaosf.h
index c3df539..b8060bc 100644
--- a/bfd/hosts/alphaosf.h
+++ b/bfd/hosts/alphaosf.h
@@ -12,33 +12,10 @@
/* Make the basic types 64-bit quantities on the host */
#define HOST_64_BIT long
-
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-
-
typedef unsigned long uint64e_type;
-
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
-
typedef unsigned long uint64_type;
typedef long int64_type;
-
#define BYTES_IN_PRINTF_INT 4
#define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff))
diff --git a/bfd/hosts/amix.h b/bfd/hosts/amix.h
index ed0a1db..848a43f 100644
--- a/bfd/hosts/amix.h
+++ b/bfd/hosts/amix.h
@@ -47,20 +47,4 @@ extern long atol();
extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/apollo68.h b/bfd/hosts/apollo68.h
index b9900d6..8dad598 100644
--- a/bfd/hosts/apollo68.h
+++ b/bfd/hosts/apollo68.h
@@ -23,20 +23,4 @@ extern PTR EXFUN(realloc, (PTR, unsigned));
extern void EXFUN( free,(PTR));
#endif
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/apollov68.h b/bfd/hosts/apollov68.h
index e425310..c13dfbf 100644
--- a/bfd/hosts/apollov68.h
+++ b/bfd/hosts/apollov68.h
@@ -34,20 +34,4 @@ extern PTR EXFUN(realloc, (PTR, unsigned));
extern void EXFUN( free,(PTR));
#endif
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/delta88.h b/bfd/hosts/delta88.h
index 046b7c2..fe8d76d 100644
--- a/bfd/hosts/delta88.h
+++ b/bfd/hosts/delta88.h
@@ -77,20 +77,4 @@ extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/dose.h b/bfd/hosts/dose.h
index 359d15b..5b2f24f 100644
--- a/bfd/hosts/dose.h
+++ b/bfd/hosts/dose.h
@@ -12,20 +12,4 @@
#define SEEK_SET 0
#define SEEK_CUR 1
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-bin.h"
diff --git a/bfd/hosts/go32.h b/bfd/hosts/go32.h
index 34aff36..2c71b2e 100644
--- a/bfd/hosts/go32.h
+++ b/bfd/hosts/go32.h
@@ -15,20 +15,4 @@
#define NO_FCNTL
-/* EXACT TYPES */
- typedef char int8e_type;
- typedef unsigned char uint8e_type;
- typedef short int16e_type;
- typedef unsigned short uint16e_type;
- typedef int int32e_type;
- typedef unsigned int uint32e_type;
-
- /* CORRECT SIZE OR GREATER */
- typedef char int8_type;
- typedef unsigned char uint8_type;
- typedef short int16_type;
- typedef unsigned short uint16_type;
- typedef int int32_type;
- typedef unsigned int uint32_type;
-
#include "fopen-bin.h"
diff --git a/bfd/hosts/harris.h b/bfd/hosts/harris.h
index 274ccbd..e628680 100644
--- a/bfd/hosts/harris.h
+++ b/bfd/hosts/harris.h
@@ -21,19 +21,5 @@ extern void EXFUN(exit,(int));
extern void EXFUN(bzero,(char *, int));
extern int strtol();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
#include "fopen-same.h"
diff --git a/bfd/hosts/hp300.h b/bfd/hosts/hp300.h
index e9d764a..48f1e3d 100644
--- a/bfd/hosts/hp300.h
+++ b/bfd/hosts/hp300.h
@@ -33,20 +33,4 @@ rename(from, to)
}
#endif
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/hppabsd.h b/bfd/hosts/hppabsd.h
index a1ffcbb..db35a85 100644
--- a/bfd/hosts/hppabsd.h
+++ b/bfd/hosts/hppabsd.h
@@ -33,21 +33,6 @@ extern void free PARAMS ((PTR));
#define HOST_DATA_START_ADDR UDATASEG
#define HOST_STACK_END_ADDR KSTAKSEG
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
#include "fopen-same.h"
#endif /* _HPPABSD_H */
diff --git a/bfd/hosts/hppahpux.h b/bfd/hosts/hppahpux.h
index 5f5e7c3..e36ed9b 100644
--- a/bfd/hosts/hppahpux.h
+++ b/bfd/hosts/hppahpux.h
@@ -37,22 +37,6 @@ rename(from, to)
}
#endif
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
#endif /* _HPPAHPUX_H */
diff --git a/bfd/hosts/i386aix.h b/bfd/hosts/i386aix.h
index ce1a8c6..d4d8d8a 100644
--- a/bfd/hosts/i386aix.h
+++ b/bfd/hosts/i386aix.h
@@ -44,20 +44,4 @@ extern long atol();
extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/i386isc.h b/bfd/hosts/i386isc.h
index 67d74f7..239bcd9 100644
--- a/bfd/hosts/i386isc.h
+++ b/bfd/hosts/i386isc.h
@@ -35,22 +35,6 @@ extern PTR EXFUN(realloc, (PTR, unsigned));
extern void EXFUN(free,(PTR));
#endif
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
#ifndef fileno
diff --git a/bfd/hosts/i386mach.h b/bfd/hosts/i386mach.h
index 874ead4..997aa7c 100644
--- a/bfd/hosts/i386mach.h
+++ b/bfd/hosts/i386mach.h
@@ -28,19 +28,4 @@ extern void EXFUN(free, (PTR));
#define HOST_TEXT_START_ADDR 0x10000 /* By inspection */
#define HOST_STACK_END_ADDR KERNBASE
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
#include "fopen-same.h"
diff --git a/bfd/hosts/i386v.h b/bfd/hosts/i386v.h
index a971991..b81aa5b 100644
--- a/bfd/hosts/i386v.h
+++ b/bfd/hosts/i386v.h
@@ -33,20 +33,4 @@ extern PTR EXFUN(realloc, (PTR, unsigned));
extern void EXFUN(free,(PTR));
#endif
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/i386v4.h b/bfd/hosts/i386v4.h
index 7b72059..3e83514 100644
--- a/bfd/hosts/i386v4.h
+++ b/bfd/hosts/i386v4.h
@@ -47,20 +47,4 @@ extern long atol();
extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/irix3.h b/bfd/hosts/irix3.h
index 1ae0a58..caa7901 100644
--- a/bfd/hosts/irix3.h
+++ b/bfd/hosts/irix3.h
@@ -22,20 +22,4 @@
#define SEEK_CUR 1
#endif
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/irix4.h b/bfd/hosts/irix4.h
index c9a15fd..5da3636 100644
--- a/bfd/hosts/irix4.h
+++ b/bfd/hosts/irix4.h
@@ -24,20 +24,4 @@
#define SEEK_CUR 1
#endif
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/ncr3000.h b/bfd/hosts/ncr3000.h
index 7b72059..3e83514 100644
--- a/bfd/hosts/ncr3000.h
+++ b/bfd/hosts/ncr3000.h
@@ -47,20 +47,4 @@ extern long atol();
extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/rs6000.h b/bfd/hosts/rs6000.h
index 1d5863b..5b20649 100644
--- a/bfd/hosts/rs6000.h
+++ b/bfd/hosts/rs6000.h
@@ -14,20 +14,4 @@
#define SEEK_SET 0
#define SEEK_CUR 1
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/rtbsd.h b/bfd/hosts/rtbsd.h
index 071ee04..d4c3090 100644
--- a/bfd/hosts/rtbsd.h
+++ b/bfd/hosts/rtbsd.h
@@ -17,20 +17,4 @@
extern char *malloc();
extern void free();
-
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
#include "fopen-same.h"
diff --git a/bfd/hosts/sparc-ll.h b/bfd/hosts/sparc-ll.h
index 1f7c695..32618f2 100644
--- a/bfd/hosts/sparc-ll.h
+++ b/bfd/hosts/sparc-ll.h
@@ -74,53 +74,37 @@ extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-
#ifdef __GNUC__
typedef unsigned long long uint64e_type;
#else
typedef struct {
- uint32e_type low, high;
+ unsigned long low, high;
} uint64e_type;
#endif
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
#ifdef __GNUC__
typedef unsigned long long uint64_type;
typedef long long int64_type;
#else
typedef struct {
- uint32e_type low, high;
+ unsigned long low, high;
} uint64_type;
typedef struct {
- uint32e_type low, high;
+ unsigned long low, high;
} int64_type;
#endif
-
#define BYTES_IN_PRINTF_INT 4
#ifndef __GNUC__
-#define uint64_typeLOW(x) (uint32_type)(((x).low))
-#define uint64_typeHIGH(x) (uint32_type)(((x).high))
+#define uint64_typeLOW(x) (unsigned long)(((x).low))
+#define uint64_typeHIGH(x) (unsigned long)(((x).high))
#else
-#define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff))
-#define uint64_typeHIGH(x) (uint32_type)(((x) >> 32) & 0xffffffff)
+#define uint64_typeLOW(x) (unsigned long)(((x) & 0xffffffff))
+#define uint64_typeHIGH(x) (unsigned long)(((x) >> 32) & 0xffffffff)
#endif
+
#include "fopen-same.h"
diff --git a/bfd/hosts/std-host.h b/bfd/hosts/std-host.h
index 4bb3e15..966d0c6 100644
--- a/bfd/hosts/std-host.h
+++ b/bfd/hosts/std-host.h
@@ -85,61 +85,23 @@ extern int fputc();
extern int unlink();
#endif /* STDC_HEADERS */
-/* EXACT TYPES */
-#ifndef int8e_type
-#define int8e_type char
-#endif
-#ifndef uint8e_type
-#define uint8e_type unsigned char
-#endif
-#ifndef int16e_type
-#define int16e_type short
-#endif
-#ifndef uint16e_type
-#define uint16e_type unsigned short
-#endif
-#ifndef int32e_type
-#define int32e_type int
-#endif
-#ifndef uint32e_type
-#define uint32e_type unsigned int
-#endif
#ifndef uint64e_type
#ifdef __GNUC__
#define uint64e_type unsigned long long
#define int64e_type long long
-#define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff))
-#define uint64_typeHIGH(x) (uint32_type)(((x) >> 32) & 0xffffffff)
+#define uint64_typeLOW(x) (unsigned long)(((x) & 0xffffffff))
+#define uint64_typeHIGH(x) (unsigned long)(((x) >> 32) & 0xffffffff)
#else
struct uint64e_struct {
- uint32e_type low, high;
+ unsigned long low, high;
};
#define uint64e_type struct uint64e_struct
#define int64e_type struct uint64e_struct
-#define uint64_typeLOW(x) (uint32_type)(((x).low))
-#define uint64_typeHIGH(x) (uint32_type)(((x).high))
+#define uint64_typeLOW(x) (unsigned long)(((x).low))
+#define uint64_typeHIGH(x) (unsigned long)(((x).high))
#endif
#endif
-/* CORRECT SIZE OR GREATER */
-#ifndef int8_type
-#define int8_type int8e_type
-#endif
-#ifndef uint8_type
-#define uint8_type uint8e_type
-#endif
-#ifndef int16_type
-#define int16_type int16e_type
-#endif
-#ifndef uint16_type
-#define uint16_type uint16e_type
-#endif
-#ifndef int32_type
-#define int32_type int32e_type
-#endif
-#ifndef uint32_type
-#define uint32_type uint32e_type
-#endif
#ifndef int64_type
#define int64_type int64e_type
#endif
diff --git a/bfd/hosts/stratus.h b/bfd/hosts/stratus.h
index dbe7a01..6d7d50c 100644
--- a/bfd/hosts/stratus.h
+++ b/bfd/hosts/stratus.h
@@ -47,20 +47,4 @@ extern long atol();
extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/sun3.h b/bfd/hosts/sun3.h
index 0300836..8d2d182 100644
--- a/bfd/hosts/sun3.h
+++ b/bfd/hosts/sun3.h
@@ -60,20 +60,4 @@ extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/sysv4.h b/bfd/hosts/sysv4.h
index 5c9107b..796c21d 100644
--- a/bfd/hosts/sysv4.h
+++ b/bfd/hosts/sysv4.h
@@ -48,20 +48,4 @@ extern long atol();
extern int fputc();
extern int unlink();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"
diff --git a/bfd/hosts/ultra3.h b/bfd/hosts/ultra3.h
index 17aad5a..7d9935b 100644
--- a/bfd/hosts/ultra3.h
+++ b/bfd/hosts/ultra3.h
@@ -17,19 +17,4 @@
extern char *malloc();
extern void free();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
#include "fopen-same.h"
diff --git a/bfd/hosts/we32k.h b/bfd/hosts/we32k.h
index 6de135e..9a76723 100644
--- a/bfd/hosts/we32k.h
+++ b/bfd/hosts/we32k.h
@@ -24,20 +24,4 @@ extern void EXFUN(bzero,(char *, int));
extern int strtol();
#define NO_STDARG 1
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
#include "fopen-same.h"