From 8d46d56dd3a826e8d9c028964a264bee34b18ac9 Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Wed, 28 Aug 2019 00:03:29 -0400
Subject: add support for musl-libc

---
 src/admin/ladmin.cpp |  2 +-
 src/io/fd.cpp        |  8 ++++----
 src/io/fd.hpp        | 14 +++++++-------
 src/map/grfio.cpp    |  2 +-
 src/tests/fdhack.hpp |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/admin/ladmin.cpp b/src/admin/ladmin.cpp
index ac9be1d..bb10bae 100644
--- a/src/admin/ladmin.cpp
+++ b/src/admin/ladmin.cpp
@@ -1504,7 +1504,7 @@ void prompt(void)
 
         // get command and parameter
         // TODO figure out a better way to do stdio
-        static auto cin = make_unique<io::ReadFile>(io::FD::stdin().dup());
+        static auto cin = make_unique<io::ReadFile>(io::FD::stdin_().dup());
         AString buf;
         cin->getline(buf);
 
diff --git a/src/io/fd.cpp b/src/io/fd.cpp
index 4d7b215..17acc89 100644
--- a/src/io/fd.cpp
+++ b/src/io/fd.cpp
@@ -106,11 +106,11 @@ namespace io
     {
         return ::recvmsg(fd, msg, flags);
     }
-    ssize_t FD::pread(void *buf, size_t count, off_t offset)
+    ssize_t FD::pread(void *buf, size_t count, int64_t offset)
     {
         return ::pread(fd, buf, count, offset);
     }
-    ssize_t FD::pwrite(const void *buf, size_t count, off_t offset)
+    ssize_t FD::pwrite(const void *buf, size_t count, int64_t offset)
     {
         return ::pwrite(fd, buf, count, offset);
     }
@@ -122,11 +122,11 @@ namespace io
     {
         return ::writev(fd, iov, iovcnt);
     }
-    ssize_t FD::preadv(const struct iovec *iov, int iovcnt, off_t offset)
+    ssize_t FD::preadv(const struct iovec *iov, int iovcnt, int64_t offset)
     {
         return ::preadv(fd, iov, iovcnt, offset);
     }
-    ssize_t FD::pwritev(const struct iovec *iov, int iovcnt, off_t offset)
+    ssize_t FD::pwritev(const struct iovec *iov, int iovcnt, int64_t offset)
     {
         return ::pwritev(fd, iov, iovcnt, offset);
     }
diff --git a/src/io/fd.hpp b/src/io/fd.hpp
index 517c7af..2a6c7bd 100644
--- a/src/io/fd.hpp
+++ b/src/io/fd.hpp
@@ -49,11 +49,11 @@ namespace io
         FD cast_dammit(int f) { return FD(f); }
 
         static
-        FD stdin() { return FD(0); }
+        FD stdin_() { return FD(0); }
         static
-        FD stdout() { return FD(1); }
+        FD stdout_() { return FD(1); }
         static
-        FD stderr() { return FD(2); }
+        FD stderr_() { return FD(2); }
 
         static const int DEFAULT_MODE = 0666;
 
@@ -87,12 +87,12 @@ namespace io
         ssize_t recvfrom(void *buf, size_t len, int flags,
                  struct sockaddr *src_addr, socklen_t *addrlen);
         ssize_t recvmsg(struct msghdr *msg, int flags);
-        ssize_t pread(void *buf, size_t count, off_t offset);
-        ssize_t pwrite(const void *buf, size_t count, off_t offset);
+        ssize_t pread(void *buf, size_t count, int64_t offset);
+        ssize_t pwrite(const void *buf, size_t count, int64_t offset);
         ssize_t readv(const struct iovec *iov, int iovcnt);
         ssize_t writev(const struct iovec *iov, int iovcnt);
-        ssize_t preadv(const struct iovec *iov, int iovcnt, off_t offset);
-        ssize_t pwritev(const struct iovec *iov, int iovcnt, off_t offset);
+        ssize_t preadv(const struct iovec *iov, int iovcnt, int64_t offset);
+        ssize_t pwritev(const struct iovec *iov, int iovcnt, int64_t offset);
 
         int close();
         int shutdown(int);
diff --git a/src/map/grfio.cpp b/src/map/grfio.cpp
index 3475108..83a65de 100644
--- a/src/map/grfio.cpp
+++ b/src/map/grfio.cpp
@@ -100,7 +100,7 @@ std::vector<uint8_t> grfio_reads(MapName rname)
                 rname, lfname);
         return {};
     }
-    off_t len = lseek(fd, 0, SEEK_END);
+    int64_t len = lseek(fd, 0, SEEK_END);
     assert (len != -1);
     std::vector<uint8_t> buffer(len);
     ssize_t err = pread(fd, buffer.data(), len, 0);
diff --git a/src/tests/fdhack.hpp b/src/tests/fdhack.hpp
index c75bfea..fb0953e 100644
--- a/src/tests/fdhack.hpp
+++ b/src/tests/fdhack.hpp
@@ -51,7 +51,7 @@ public:
 class QuietFd : ReplaceFd
 {
 public:
-    QuietFd(io::FD num=io::FD::stderr())
+    QuietFd(io::FD num=io::FD::stderr_())
     : ReplaceFd(num, io::FD::open("/dev/null"_s, O_RDONLY), true)
     {}
 };
-- 
cgit v1.2.3-60-g2f50