From 25b8dcd3e31a9b09ce6180d34273d68242791d79 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Mon, 16 Sep 2013 13:47:55 +0000 Subject: removed not needed _MSC_VER checks git-svn-id: http://svn.miranda-ng.org/main/trunk@6085 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/SHA1.cpp | 4 ---- protocols/Xfire/src/SHA1.h | 15 --------------- 2 files changed, 19 deletions(-) (limited to 'protocols/Xfire/src') diff --git a/protocols/Xfire/src/SHA1.cpp b/protocols/Xfire/src/SHA1.cpp index 31267e43ef..36a3facb28 100644 --- a/protocols/Xfire/src/SHA1.cpp +++ b/protocols/Xfire/src/SHA1.cpp @@ -29,11 +29,7 @@ // Rotate x bits to the left #ifndef ROL32 -#ifdef _MSC_VER #define ROL32(_val32, _nBits) _rotl(_val32, _nBits) -#else -#define ROL32(_val32, _nBits) (((_val32)<<(_nBits))|((_val32)>>(32-(_nBits)))) -#endif #endif #ifdef SHA1_LITTLE_ENDIAN diff --git a/protocols/Xfire/src/SHA1.h b/protocols/Xfire/src/SHA1.h index b95a00970f..2bb15df86a 100644 --- a/protocols/Xfire/src/SHA1.h +++ b/protocols/Xfire/src/SHA1.h @@ -30,9 +30,7 @@ #include // Needed for strcat and strcpy #include -#ifdef _MSC_VER #include -#endif // If you're compiling big endian, just comment out the following line #define SHA1_LITTLE_ENDIAN @@ -46,22 +44,9 @@ #ifndef UINT_32 -#ifdef _MSC_VER - #define UINT_8 unsigned __int8 #define UINT_32 unsigned __int32 -#else - -#define UINT_8 unsigned char - -#if (ULONG_MAX == 0xFFFFFFFF) -#define UINT_32 unsigned long -#else -#define UINT_32 unsigned int -#endif - -#endif #endif -- cgit v1.2.3