From 6589eade24599de62c5c2e6ca5dc97560e4bc958 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Thu, 18 Jun 2015 01:19:33 -0700
Subject: [PATCH] Util: Clean up some defines

---
 src/util/common.h | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/util/common.h b/src/util/common.h
index 9837a61ab..bdf5af40c 100644
--- a/src/util/common.h
+++ b/src/util/common.h
@@ -19,16 +19,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "version.h"
+
 #ifdef _MSC_VER
-#ifdef _WIN64
-typedef int64_t off_t;
-typedef int64_t ssize_t;
-#else
-typedef int32_t off_t;
-typedef int32_t ssize_t;
-#endif
+typedef intptr_t off_t;
+typedef intptr_t ssize_t;
 #define restrict __restrict
-#define SSIZE_MAX ((ssize_t) SIZE_MAX)
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
 #define ftruncate _chsize
@@ -37,7 +33,9 @@ typedef int32_t ssize_t;
 #include <unistd.h>
 #endif
 
-#include "version.h"
+#ifndef SSIZE_MAX
+#define SSIZE_MAX ((ssize_t) (SIZE_MAX >> 1))
+#endif
 
 #define UNUSED(V) (void)(V)