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 3dfbb3cf2f80dce1b2bb903811e3d40a733aa944..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>
@@ -20,44 +21,47 @@
 #include <stdlib.h>
 /*#include <string.h>*/
 #else
-extern char *EXFUN(mktemp,(CONST char*));
-extern int   EXFUN(fflush,(FILE *));
-extern int   EXFUN(write,(int, CONST char *, int));
-extern void  EXFUN(abort,(void));
-extern int   EXFUN(close,(int));
-extern int   EXFUN(fcntl,(int des, int cmd, int e));
-extern int   EXFUN(fprintf,(FILE *,char *,...));
-extern int   EXFUN(printf,(char *,...));
-extern int   EXFUN(qsort,(void *data,int els, int siz, int func()));
-extern void  EXFUN(exit,(int));
-extern int   EXFUN(fseek,(FILE*, int, int));
-extern int   EXFUN(fclose,(FILE*));
-extern void  EXFUN(bcopy,(char*,char*,int));
-extern int   EXFUN(bcmp,(char *, char *, int));
-extern void  EXFUN(bzero,(char *, int));
-extern PTR   EXFUN(memset,(PTR, int, int));
-extern void  EXFUN(puts,(CONST char*));
-extern void  EXFUN(fputs,(CONST char*,FILE*));
-extern int   EXFUN(rmdir,(CONST char *));
-extern int   EXFUN(getuid,(void));
-extern int   EXFUN(getgid,(void));
-extern int   EXFUN(rename,(CONST char *, CONST char*));
-extern int   EXFUN(getuid,());
-extern int   EXFUN(getgid,());
-extern void  EXFUN(perror,(CONST char *));
+extern int   fprintf PARAMS ((FILE *,char *,...));
+extern int   printf PARAMS((char *,...));
+extern char *mktemp ();
+extern int   fflush ();
+extern int   write ();
+extern void  abort ();
+extern int   close ();
+extern int   fcntl ();
+extern int   qsort ();
+extern void  exit ();
+extern int   fseek ();
+extern int   fclose ();
+extern void  bcopy ();
+extern int   bcmp ();
+extern void  bzero ();
+extern PTR   memset ();
+
+/* 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 ();
+extern int   rename ();
+extern void  perror ();
 #ifndef DONTDECLARE_MALLOC
-extern PTR   EXFUN(malloc,(unsigned));
-extern PTR   EXFUN(realloc, (PTR, unsigned));
+extern PTR   malloc ();
+extern PTR   realloc ();
 #endif
 
 #ifndef __GNUC__
-extern PTR   EXFUN(memcpy,(PTR,CONST PTR,unsigned int));
+extern PTR   memcpy ();
 #else
-/* char * EXFUN( memcpy,(char *,CONST char *,unsigned int)); */
+/* char * memcpy (); */
 #endif
 
 #ifdef __STDC__
-extern void EXFUN(free,(PTR));
+extern void free ();
 #else
 extern int free();
 #endif
@@ -70,7 +74,6 @@ extern int chmod();
 extern int fread();
 extern int fstat();
 extern int fwrite();
-extern int sscanf();
 extern int stat();
 extern int strtol();
 
@@ -85,72 +88,12 @@ extern long atol();
 extern char *getenv();
 extern int fputc();
 extern int unlink();
-#endif /* __STDC__ */
-
-/* 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 struct long long
-#define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff))
-#define uint64_typeHIGH(x) (uint32_type)(((x) >> 32) & 0xffffffff)
-#else
-typedef 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
+#endif /* STDC_HEADERS */
 
 #ifndef BYTES_IN_PRINTF_INT
 #define BYTES_IN_PRINTF_INT 4
 #endif
 
 #include "fopen-same.h"
+#define hosts_std_host_H
+#endif