From: Ari Johnson <ari@cobramush.org>
Date: Fri, 6 Apr 2007 19:16:20 +0000 (+0000)
Subject: Fixed SHS on 64-bit platforms
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=f1ef2b3ed3df0c2cf42f3aef9eb53edededdc306;p=cobramush.git

Fixed SHS on 64-bit platforms
(cherry picked from commit f432dba0ddc3ac03ee4ac589976bb1eef285c02f)
---

diff --git a/game/txt/changes/0.72p4 b/game/txt/changes/0.72p4
index a0646a6..7d4d7ac 100644
--- a/game/txt/changes/0.72p4
+++ b/game/txt/changes/0.72p4
@@ -16,4 +16,6 @@ CobraMUSH Version 0.72p4
     * Improved PennMUSH to CobraMUSH flag conversion code for flags that are
       set to be of 'ANY' type. [RLB]
     * Fixed a bug related to uninitialized lastmod entries [AEJ]
+    * Fixed SHS 64-bit incompatability, to allow password encryption
+      to work properly on 64-bit platforms [AEJ]
 
diff --git a/hdrs/shs.h b/hdrs/shs.h
index b350ff7..44fa51d 100644
--- a/hdrs/shs.h
+++ b/hdrs/shs.h
@@ -18,9 +18,6 @@ typedef unsigned char BYTE;
 typedef long LONG;
 #else
 typedef unsigned char BYTE;
-#ifdef HAS_UINT32_T
-typedef uint32_t LONG;
-#else
 typedef unsigned long LONG;
 #endif
 #endif