Get 64bit stuff right.

[deliverable/binutils-gdb.git] / bfd / hosts / std-host.h

diff --git a/bfd/hosts/std-host.h b/bfd/hosts/std-host.h
index 20ba5b3a29cf48325e988f3c4e4ce2702a8e7119..30328411b645b95074a04fdb8fcfbc548dc5d909 100644 (file)
--- a/bfd/hosts/std-host.h
+++ b/bfd/hosts/std-host.h
@@ -1,3 +1,4 @@
+#ifndef hosts_std_host_H
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
@@ -36,8 +37,13 @@ extern void  bcopy ();
 extern int   bcmp ();
 extern void  bzero ();
 extern PTR   memset ();
-extern void  puts ();
-extern void  fputs ();
+
+/* These used to be declared to return void.  As far as I know that is just
+   wrong; are there any systems for which they actually don't return a
+   value (EOF for error, something else for success).  */
+extern int  puts ();
+extern int  fputs ();
+
 extern int   rmdir ();
 extern int   getuid ();
 extern int   getgid ();
@@ -84,70 +90,10 @@ 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)
-#else
-struct  uint64e_struct {
-  uint32e_type 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))
-#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
-#ifndef uint64_type
-#define uint64_type uint64e_type
-#endif
-
 #ifndef BYTES_IN_PRINTF_INT
 #define BYTES_IN_PRINTF_INT 4
 #endif
 
 #include "fopen-same.h"
+#define hosts_std_host_H
+#endif