diff options
author | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
commit | fd0f611b70a83d80fe8793af785542ee5541b7cd (patch) | |
tree | bededd22bb7eeec52e20083237ab7e4113445a16 /ssh-rand-helper.c | |
parent | c44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff) | |
parent | ebd2ce335af5861020c79fddb1ae35c03bf036cf (diff) |
Merge 3.9p1 to the trunk.
Diffstat (limited to 'ssh-rand-helper.c')
-rw-r--r-- | ssh-rand-helper.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index 8a320a71e..86af3893d 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "pathnames.h" | 39 | #include "pathnames.h" |
40 | #include "log.h" | 40 | #include "log.h" |
41 | 41 | ||
42 | RCSID("$Id: ssh-rand-helper.c,v 1.16 2003/11/21 12:56:47 djm Exp $"); | 42 | RCSID("$Id: ssh-rand-helper.c,v 1.18 2004/07/17 04:07:42 dtucker Exp $"); |
43 | 43 | ||
44 | /* Number of bytes we write out */ | 44 | /* Number of bytes we write out */ |
45 | #define OUTPUT_SEED_SIZE 48 | 45 | #define OUTPUT_SEED_SIZE 48 |
@@ -63,15 +63,7 @@ RCSID("$Id: ssh-rand-helper.c,v 1.16 2003/11/21 12:56:47 djm Exp $"); | |||
63 | # define SSH_PRNG_COMMAND_FILE SSHDIR "/ssh_prng_cmds" | 63 | # define SSH_PRNG_COMMAND_FILE SSHDIR "/ssh_prng_cmds" |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #ifdef HAVE___PROGNAME | ||
67 | extern char *__progname; | 66 | extern char *__progname; |
68 | #else | ||
69 | char *__progname; | ||
70 | #endif | ||
71 | |||
72 | #ifndef offsetof | ||
73 | # define offsetof(type, member) ((size_t) &((type *)0)->member) | ||
74 | #endif | ||
75 | 67 | ||
76 | #define WHITESPACE " \t\n" | 68 | #define WHITESPACE " \t\n" |
77 | 69 | ||