From 61d7830b9dd75670f9f549ffeb33c300a2383293 Mon Sep 17 00:00:00 2001 From: Ari Johnson Date: Mon, 9 Apr 2007 11:33:34 +0000 Subject: [PATCH] Conflicts fix for 64-bit SHS fix (cherry picked from commit 0676da0b801cc6754fbbe50f361d7b0cdf54c8b2) --- hdrs/shs.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.30.2