Make stuff build on openbsd

arch/alpha/alpha_tru64_process.cc:
    So, I don't know why linux uses an off_t here.
    I'm also not sure why linux defines an off_t to be a long
    Let's just use long here since it works for linux, and that's
    what bsd does
base/inifile.cc:
    correct #include for OpenBSD
dev/disk_image.cc:
    the correct type for this is streampos

--HG--
extra : convert_revision : f3ac3a3b8515d66e07ffb9780d8a9e387297b6a0

diff --git a/arch/alpha/alpha_tru64_process.cc b/arch/alpha/alpha_tru64_process.cc
index f411e594d8416cea00a29d84fb570571c26a9a29..ccf4d4d6cc898800ddafcfbfac0bd518c1fb6ccb 100644 (file)
--- a/arch/alpha/alpha_tru64_process.cc
+++ b/arch/alpha/alpha_tru64_process.cc
@@ -629,7 +629,7 @@ class Tru64 {
         // just pass basep through uninterpreted.
         TypedBufferArg<int64_t> basep(tgt_basep);
         basep.copyIn(xc->mem);
-        ::off_t host_basep = (off_t)*basep;
+        long host_basep = (off_t)*basep;
         int host_result = getdirentries(fd, host_buf, tgt_nbytes, &host_basep);
 
         // check for error

diff --git a/base/inifile.cc b/base/inifile.cc
index 2717a534deedefaba9eac3d7d1958778536a9fe4..74d47204e0db10fb90df30d3e1dea18b795829e8 100644 (file)
--- a/base/inifile.cc
+++ b/base/inifile.cc
@@ -35,6 +35,9 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#if defined(__OpenBSD__)
+#include <libgen.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/dev/disk_image.cc b/dev/disk_image.cc
index cbcd16a25e30afb40e9c536875a1b828257b40a9..02c8b50b641474c27b99c69edef6c63628ea7db1 100644 (file)
--- a/dev/disk_image.cc
+++ b/dev/disk_image.cc
@@ -109,7 +109,7 @@ RawDiskImage::read(uint8_t *data, off_t offset) const
     if (stream.seekg(offset * SectorSize, ios::beg) < 0)
         panic("Could not seek to location in file");
 
-    off_t pos = stream.tellg();
+    streampos pos = stream.tellg();
     stream.read((char *)data, SectorSize);
 
     DPRINTF(DiskImageRead, "read: offset=%d\n", (uint64_t)offset);
@@ -136,7 +136,7 @@ RawDiskImage::write(const uint8_t *data, off_t offset)
     DPRINTF(DiskImageWrite, "write: offset=%d\n", (uint64_t)offset);
     DDUMP(DiskImageWrite, data, SectorSize);
 
-    off_t pos = stream.tellp();
+    streampos pos = stream.tellp();
     stream.write((const char *)data, SectorSize);
     return stream.tellp() - pos;
 }