Quellcode durchsuchen

ifdefs related to 64bit MS Windows build

Conflicts:
	src/headers/tomcrypt_cfg.h
	src/prngs/rng_get_bytes.c
karel-m vor 12 Jahren
Ursprung
Commit
8afdb8831d
2 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
  1. 1 1
      src/headers/tomcrypt_cfg.h
  2. 1 1
      src/prngs/rng_get_bytes.c

+ 1 - 1
src/headers/tomcrypt_cfg.h

@@ -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

+ 1 - 1
src/prngs/rng_get_bytes.c

@@ -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