From a5338d2f594de69d903931bd853a141bced1add7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 28 Sep 2016 20:43:02 -0400
Subject: [PATCH] Fix rebase_delta type mismatch

See #984. GCC wasn't complaining about this on x64 for some reason.

Also reordered includes.
---
 library/include/VersionInfo.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/include/VersionInfo.h b/library/include/VersionInfo.h
index b3d6c8346..dc959f1db 100644
--- a/library/include/VersionInfo.h
+++ b/library/include/VersionInfo.h
@@ -25,13 +25,13 @@ distribution.
 
 #pragma once
 
-#include "Pragma.h"
-#include "Export.h"
-/* #include "Types.h" */
+#include <algorithm>
 #include <map>
 #include <sys/types.h>
 #include <vector>
-#include <algorithm>
+
+#include "Export.h"
+#include "Pragma.h"
 
 namespace DFHack
 {
@@ -53,7 +53,7 @@ namespace DFHack
         std::map <std::string, uintptr_t> Addresses;
         std::map <std::string, uintptr_t> VTables;
         uintptr_t base;
-        uintptr_t rebase_delta;
+        intptr_t rebase_delta;
         std::string version;
         OSType OS;
     public:
@@ -76,7 +76,7 @@ namespace DFHack
         };
 
         uintptr_t getBase () const { return base; };
-        int getRebaseDelta() const { return rebase_delta; }
+        intptr_t getRebaseDelta() const { return rebase_delta; }
         void setBase (const uintptr_t _base) { base = _base; };
         void rebaseTo(const uintptr_t new_base)
         {