diff options
Diffstat (limited to 'cipher/rndw32.c')
-rw-r--r-- | cipher/rndw32.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cipher/rndw32.c b/cipher/rndw32.c index 4ed4f772f..5e42353aa 100644 --- a/cipher/rndw32.c +++ b/cipher/rndw32.c @@ -433,7 +433,7 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester ) CloseHandle (hDevice); } - #if 0 /* we don't need this in GnuPG */ +#if 0 /* we don't need this in GnuPG */ /* Wait for any async keyset driver binding to complete. You may be * wondering what this call is doing here... the reason it's necessary is * because RegQueryValueEx() will hang indefinitely if the async driver @@ -453,7 +453,7 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester ) * this, we have to wait until any async driver bind has completed * before we can call RegQueryValueEx() */ waitSemaphore (SEMAPHORE_DRIVERBIND); - #endif +#endif /* Get information from the system performance counters. This can take * a few seconds to do. In some environments the call to @@ -587,7 +587,7 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester * events in input queue, and milliseconds since Windows was started */ { byte buffer[20*sizeof(ulong)], *bufptr; bufptr = buffer; - #define ADD(f) do { ulong along = (ulong)(f); \ +#define ADD(f) do { ulong along = (ulong)(f); \ memcpy (bufptr, &along, sizeof (along) ); \ bufptr += sizeof (along); } while (0) ADD ( GetActiveWindow ()); @@ -611,7 +611,7 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester assert ( bufptr-buffer < sizeof (buffer) ); (*add) ( buffer, bufptr-buffer, requester ); - #undef ADD +#undef ADD } /* Get multiword system information: Current caret position, current @@ -699,5 +699,4 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester return 0; } - #endif /*USE_RNDW32*/ |