tyler.durden/pixiewps
1
0
Fork 0
mirror of https://github.com/wiire-a/pixiewps.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed redefinition of type ulong64 in tomcrypt

Browse Source
This commit is contained in:
wiire-a 2018-01-06 20:21:43 +01:00
parent ce5d96b661
commit 61e73e5703
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/crypto/tc/tomcrypt_cfg.h
View File

@ -197,10 +197,16 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const char *s1, const char *s2);
/* ulong64: 64-bit data type */ /* ulong64: 64-bit data type */
#ifdef _MSC_VER #ifdef _MSC_VER
#define CONST64(n) n ## ui64 #define CONST64(n) n ## ui64
#ifndef LTC_ULONG64
#define LTC_ULONG64
typedef unsigned __int64 ulong64; typedef unsigned __int64 ulong64;
#endif
#else #else
#define CONST64(n) n ## ULL #define CONST64(n) n ## ULL
#ifndef LTC_ULONG64
#define LTC_ULONG64
typedef unsigned long long ulong64; typedef unsigned long long ulong64;
#endif
#endif #endif
/* ulong32: "32-bit at least" data type */ /* ulong32: "32-bit at least" data type */

6
src/crypto/tfm/tfm.h
View File

@ -285,10 +285,16 @@
/* this is to make porting into LibTomCrypt easier :-) */ /* this is to make porting into LibTomCrypt easier :-) */
#ifndef CRYPT #ifndef CRYPT
#if defined(_MSC_VER) || defined(__BORLANDC__) #if defined(_MSC_VER) || defined(__BORLANDC__)
#ifndef LTC_ULONG64
#define LTC_ULONG64
typedef unsigned __int64 ulong64; typedef unsigned __int64 ulong64;
#endif
typedef signed __int64 long64; typedef signed __int64 long64;
#else #else
#ifndef LTC_ULONG64
#define LTC_ULONG64
typedef unsigned long long ulong64; typedef unsigned long long ulong64;
#endif
typedef signed long long long64; typedef signed long long long64;
#endif /* defined(_MSC_VER) ... */ #endif /* defined(_MSC_VER) ... */
#endif /* CRYPT */ #endif /* CRYPT */