From: Ari Johnson <ari@cobramush.org>
Date: Mon, 9 Apr 2007 11:33:34 +0000 (+0000)
Subject: Conflicts fix for 64-bit SHS fix
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=61d7830b9dd75670f9f549ffeb33c300a2383293;p=cobramush.git

Conflicts fix for 64-bit SHS fix
(cherry picked from commit 0676da0b801cc6754fbbe50f361d7b0cdf54c8b2)
---

diff --git a/hdrs/shs.h b/hdrs/shs.h
index 44fa51d..98b9422 100644
--- a/hdrs/shs.h
+++ b/hdrs/shs.h
@@ -18,7 +18,10 @@ typedef unsigned char BYTE;
 typedef long LONG;
 #else
 typedef unsigned char BYTE;
-typedef unsigned long LONG;
+#ifdef HAS_UINT32_T
+typedef uint32_t LONG;
+#else
+typedef unsigned int LONG;
 #endif
 #endif