projects / cobramush.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f1ef2b3)
Conflicts fix for 64-bit SHS fix
authorAri Johnson <ari@cobramush.org>
Mon, 9 Apr 2007 11:33:34 +0000 (11:33 +0000)
committerAri Johnson <ari@theari.com>
Thu, 24 Mar 2011 15:58:45 +0000 (15:58 +0000)
(cherry picked from commit 0676da0b801cc6754fbbe50f361d7b0cdf54c8b2)

hdrs/shs.h patch | blob | history

diff --git a/hdrs/shs.h b/hdrs/shs.h
index 44fa51db2a9782673f303fc42f0c5f9da8984c12..98b9422ec6b5329c4f2f6ab6c4c5e38c7dbcfcb8 100644 (file)
--- 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