diff options
author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2013-12-12 23:53:28 +0200 |
---|---|---|
committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2013-12-13 11:23:54 +0200 |
commit | a71b810ddd67ca3a1773d8f929d162551abb58eb (patch) | |
tree | 9a466e230eee0cfdbe10844c905583a89b366d0b /random | |
parent | 2e4253dc8eb512cd0e807360926dc6ba912c95b4 (diff) | |
download | libgcrypt-a71b810ddd67ca3a1773d8f929d162551abb58eb.tar.gz |
Fix W32 build
* random/rndw32.c (register_poll, slow_gatherer): Change gcry_xmalloc to
xmalloc, and gcry_xrealloc to xrealloc.
--
Patch fixes following errors:
../random/.libs/librandom.a(rndw32.o): In function `registry_poll':
.../libgcrypt/random/rndw32.c:434: undefined reference to `__gcry_USE_THE_UNDERSCORED_FUNCTION'
.../libgcrypt/random/rndw32.c:454: undefined reference to `__gcry_USE_THE_UNDERSCORED_FUNCTION'
../random/.libs/librandom.a(rndw32.o): In function `slow_gatherer':
.../random/rndw32.c:658: undefined reference to `__gcry_USE_THE_UNDERSCORED_FUNCTION'
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'random')
-rw-r--r-- | random/rndw32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/random/rndw32.c b/random/rndw32.c index 03dffaf8..c495131d 100644 --- a/random/rndw32.c +++ b/random/rndw32.c @@ -431,7 +431,7 @@ registry_poll (void (*add)(const void*, size_t, enum random_origins), } else { - pPerfData = gcry_xmalloc (cbPerfData); + pPerfData = xmalloc (cbPerfData); for (iterations=0; iterations < 10; iterations++) { dwSize = cbPerfData; @@ -451,7 +451,7 @@ registry_poll (void (*add)(const void*, size_t, enum random_origins), else if (status == ERROR_MORE_DATA) { cbPerfData += PERFORMANCE_BUFFER_STEP; - pPerfData = gcry_xrealloc (pPerfData, cbPerfData); + pPerfData = xrealloc (pPerfData, cbPerfData); } else { @@ -655,7 +655,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), This scan typically yields around 20 pieces of data, there's nothing in the range 65...128 so chances are there won't be anything above there either. */ - buffer = gcry_xmalloc (PERFORMANCE_BUFFER_SIZE); + buffer = xmalloc (PERFORMANCE_BUFFER_SIZE); for (dwType = 0; dwType < 64; dwType++) { switch (dwType) |