Get 64bit stuff right.

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

diff --git a/bfd/hosts/i386v.h b/bfd/hosts/i386v.h
index f1018c6711b61a614ec672a99da378b1654f4f75..b81aa5b5ffa0a4c38ec3ad7a1e397a85ba75fc36 100644 (file)
--- a/bfd/hosts/i386v.h
+++ b/bfd/hosts/i386v.h
@@ -5,63 +5,32 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <string.h>
-#include <sys/file.h>
+#include <unistd.h>
+
 #ifndef O_ACCMODE
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
 #endif
+#ifndef SEEK_SET
 #define SEEK_SET 0
 #define SEEK_CUR 1
+#endif
 
-/*
- * Some things that need to be defined in order to make code written for
- * BSD Unix compile under System V ("USG") Unix.  This file should be
- * conditionally included in the source.
- */
+#define USE_UTIME
 
-#include <memory.h>
+/* Some things that need to be defined in order to make code written for
+   BSD Unix compile under System V Unix.  */
+
+/*#include <memory.h>*/
 #define bcmp(b1,b2,len)                memcmp(b1,b2,len)
 #define bcopy(src,dst,len)     memcpy(dst,src,len)
 #define bzero(s,n)             memset(s,0,n)
 
 #include <string.h>
-#define index(s,c)             strchr(s,c)
-#define rindex(s,c)            strrchr(s,c)
-
-/*
- * Might not need these. Leave them out for now.
- *
-#ifdef SEEK_SET
-#      ifndef L_SET
-#              define L_SET SEEK_SET
-#      endif
-# endif
-
-#ifdef SEEK_CUR
-#      ifndef L_INCR
-#              define L_INCR SEEK_CUR
-#      endif
-# endif
- */
 
 #ifndef DONTDECLARE_MALLOC
-extern PROTO(PTR,malloc,(unsigned));
-extern PROTO(PTR ,realloc, (PTR, unsigned));
-extern PROTO(void, free,(PTR));
+extern PTR  EXFUN(malloc,(unsigned));
+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"