diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-16 14:39:48 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-16 14:39:48 +0000 |
| commit | 18fd4bec97159cbaa7501a8a1b67540e0865e88b (patch) | |
| tree | 75ebe7e194ba940cc12f8263ce9a35a32760d40e /plugins/Dbx_tree/encryption | |
| parent | 3d60e28ce573bfd28286d108eeb43ec29bf44d48 (diff) | |
removed not needed _MSC_VER checks
git-svn-id: http://svn.miranda-ng.org/main/trunk@6088 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Dbx_tree/encryption')
| -rw-r--r-- | plugins/Dbx_tree/encryption/Common/Cipher.h | 4 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/src/HC256.cpp | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/plugins/Dbx_tree/encryption/Common/Cipher.h b/plugins/Dbx_tree/encryption/Common/Cipher.h index abdcbf06be..6df8aaeb12 100644 --- a/plugins/Dbx_tree/encryption/Common/Cipher.h +++ b/plugins/Dbx_tree/encryption/Common/Cipher.h @@ -22,11 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma once
-#ifdef _MSC_VER
-#include "../../src/stdint.h"
-#else
#include <stdint.h>
-#endif
#include <wchar.h>
diff --git a/plugins/Dbx_tree/encryption/HC256/src/HC256.cpp b/plugins/Dbx_tree/encryption/HC256/src/HC256.cpp index 056b4e4dae..ea457cd4e3 100644 --- a/plugins/Dbx_tree/encryption/HC256/src/HC256.cpp +++ b/plugins/Dbx_tree/encryption/HC256/src/HC256.cpp @@ -24,11 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <stdlib.h>
#include <string.h>
-#ifndef _MSC_VER
- #define rotr(x,n) (((x)>>(n))|((x)<<(32-(n))))
-#else
- #define rotr(x,n) _lrotr(x,n)
-#endif
+#define rotr(x,n) _lrotr(x,n)
#define h1(x,y) { \
uint8_t a,b,c,d; \
|