diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-23 20:17:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-23 20:17:10 +0000 |
| commit | 1b639dab951fb73d5031aa0c1afb13e8480d1dae (patch) | |
| tree | 4e13a4d1e4c609bd01d0bf5d65c6a8acdc3d0c50 /openssl/crypto/rand/rand_nw.c | |
| parent | 51181fb7f4d135d214974bb6611d51f21475eec8 (diff) | |
| parent | b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b (diff) | |
| download | vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.tar.gz vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.tar.bz2 vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'openssl/crypto/rand/rand_nw.c')
| -rw-r--r-- | openssl/crypto/rand/rand_nw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/crypto/rand/rand_nw.c b/openssl/crypto/rand/rand_nw.c index f177ffbe8..8d5b8d2e3 100644 --- a/openssl/crypto/rand/rand_nw.c +++ b/openssl/crypto/rand/rand_nw.c @@ -160,8 +160,8 @@ int RAND_poll(void) rdtsc mov tsc, eax } -#else - asm volatile("rdtsc":"=A" (tsc)); +#elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) + asm volatile("rdtsc":"=a"(tsc)::"edx"); #endif RAND_add(&tsc, sizeof(tsc), 1); |