From 08ef4bfbff5bc35f3b0821492af4dc0db3608acb Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 5 Jul 2014 04:39:55 -0500 Subject: [PATCH] Wipe the clusterfsck that was the get16bits define in HashTools. This define takes a pointer(s8* in this case) and grabs 16bits of data from the array it points to. This can be done the generic way on all compilers, no need for specifying it another way. --- common/src/Utilities/HashTools.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/common/src/Utilities/HashTools.cpp b/common/src/Utilities/HashTools.cpp index c5c3ad3061..8ffdb0255e 100644 --- a/common/src/Utilities/HashTools.cpp +++ b/common/src/Utilities/HashTools.cpp @@ -29,16 +29,7 @@ namespace HashTools { /// const CommonHashClass GetCommonHash; -#undef get16bits -#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \ - || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__) #define get16bits(d) (*((const u16 *) (d))) -#endif - -#if !defined (get16bits) -#define get16bits(d) ((((u32)(((const ubyte *)(d))[1])) << 8)\ - +(u32)(((const ubyte *)(d))[0]) ) -#endif /// /// Calculates a hash value for an arbitrary set of binary data.