TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ifdefs related to 64bit MS Windows build

Browse Source 
Conflicts:
	src/headers/tomcrypt_cfg.h
	src/prngs/rng_get_bytes.c
This commit is contained in:
karel-m 2013-06-17 12:04:01 +02:00 committed by Steffen Jaeckel
parent 232f412709
commit 8afdb8831d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/headers/tomcrypt_cfg.h
View File

@ -56,7 +56,7 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const char *s1, const char *s2);
*/ */
/* detect x86-32 machines somewhat */ /* detect x86-32 machines somewhat */
#if !defined(__STRICT_ANSI__) && (defined(INTEL_CC) || (defined(_MSC_VER) && defined(WIN32)) || (defined(__GNUC__) && (defined(__DJGPP__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__i386__)))) #if !defined(__STRICT_ANSI__) && !defined(_WIN64) && (defined(INTEL_CC) || (defined(_MSC_VER) && defined(WIN32)) || (defined(__GNUC__) && (defined(__DJGPP__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__i386__))))
#define ENDIAN_LITTLE #define ENDIAN_LITTLE
#define ENDIAN_32BITWORD #define ENDIAN_32BITWORD
#define LTC_FAST #define LTC_FAST

2
src/prngs/rng_get_bytes.c
View File

@ -138,7 +138,7 @@ unsigned long rng_get_bytes(unsigned char *out, unsigned long outlen,
#if defined(LTC_DEVRANDOM) #if defined(LTC_DEVRANDOM)
x = rng_nix(out, outlen, callback); if (x != 0) { return x; } x = rng_nix(out, outlen, callback); if (x != 0) { return x; }
#endif #endif
#if defined(_WIN32) || defined(_WIN32) || defined(WINCE) #if defined(WIN32) || defined(_WIN32) || defined(WINCE)
x = rng_win32(out, outlen, callback); if (x != 0) { return x; } x = rng_win32(out, outlen, callback); if (x != 0) { return x; }
#endif #endif
#ifdef ANSI_RNG #ifdef ANSI_RNG