From 215f46f457d85bbeb5e854f81b8fed9ff3f9348a Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 5 Dec 2016 19:20:35 +1300 Subject: [PATCH] Fix previous commit - ssize_t should be off_t On x86-64 Linux, both are compatible types, but they aren't on x86. (cherry picked from commit 5f4ba3a69ff6cd4ecd7c880bbc0773d260413538) --- xapian-core/common/closefrom.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xapian-core/common/closefrom.cc b/xapian-core/common/closefrom.cc index 5719c2009..10607dcb4 100644 --- a/xapian-core/common/closefrom.cc +++ b/xapian-core/common/closefrom.cc @@ -90,7 +90,7 @@ Xapian::Internal::closefrom(int fd) sprintf(path, "/proc/%ld/fd", long(getpid())); #elif defined __linux__ const char * path = "/proc/self/fd"; - typedef ssize_t gde_base_type; + typedef off_t gde_base_type; #elif defined __APPLE__ // Mac OS X const char * path = "/dev/fd"; typedef int gde_base_type; -- 2.11.4.GIT