summaryrefslogtreecommitdiff
path: root/extra/yassl/taocrypt/src/random.cpp
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com>2005-06-16 16:35:09 +0500
committerunknown <svoj@mysql.com>2005-06-16 16:35:09 +0500
commit0dabdf15a7f8d75eddc11f53f8ef87de3783b72d (patch)
treec92c38ffa34a246fd7cbc247a2d6dc5f7628263e /extra/yassl/taocrypt/src/random.cpp
parentfc465d1497ce598d07ec75eeaafc7ca84b578ee6 (diff)
downloadmariadb-git-0dabdf15a7f8d75eddc11f53f8ef87de3783b72d.tar.gz
WL#2286 - Compile MySQL w/YASSL support
Merge with latest yaSSL. extra/yassl/include/lock.hpp: Merge with latest yaSSL. extra/yassl/include/socket_wrapper.hpp: Merge with latest yaSSL. extra/yassl/mySTL/helpers.hpp: Merge with latest yaSSL. extra/yassl/src/lock.cpp: Merge with latest yaSSL. extra/yassl/src/log.cpp: Merge with latest yaSSL. extra/yassl/src/socket_wrapper.cpp: Merge with latest yaSSL. extra/yassl/src/ssl.cpp: Merge with latest yaSSL. extra/yassl/src/timer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/misc.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/random.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/types.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/asn.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/misc.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/random.cpp: Merge with latest yaSSL.
Diffstat (limited to 'extra/yassl/taocrypt/src/random.cpp')
-rw-r--r--extra/yassl/taocrypt/src/random.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/yassl/taocrypt/src/random.cpp b/extra/yassl/taocrypt/src/random.cpp
index 921e710540d..69fb180720a 100644
--- a/extra/yassl/taocrypt/src/random.cpp
+++ b/extra/yassl/taocrypt/src/random.cpp
@@ -26,7 +26,7 @@
#include "random.hpp"
-#if defined(WIN32)
+#if defined(_WIN32)
#define _WIN32_WINNT 0x0400
#include <windows.h>
#include <wincrypt.h>
@@ -34,7 +34,7 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
-#endif // WIN32
+#endif // _WIN32
namespace TaoCrypt {
@@ -64,7 +64,7 @@ byte RandomNumberGenerator::GenerateByte()
}
-#if defined(WIN32)
+#if defined(_WIN32)
OS_Seed::OS_Seed()
{
@@ -87,7 +87,7 @@ void OS_Seed::GenerateSeed(byte* output, word32 sz)
}
-#else // WIN32
+#else // _WIN32
OS_Seed::OS_Seed()
@@ -122,7 +122,7 @@ void OS_Seed::GenerateSeed(byte* output, word32 sz)
}
}
-#endif // WIN32
+#endif // _WIN32