diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-02-10 05:09:35 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:38 -0500 |
commit | e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158 (patch) | |
tree | b66f04c223e55e435b6ba56f4f05d2bf03132a12 /source4/lib/genrand.c | |
parent | e3aae721a7d5c8130448d67feb3a9200e14393ac (diff) | |
download | samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.gz samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.bz2 samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.zip |
r5298: - got rid of pstring.h from includes.h. This at least makes it a bit
less likely that anyone will use pstring for new code
- got rid of winbind_client.h from includes.h. This one triggered a
huge change, as winbind_client.h was including system/filesys.h and
defining the old uint32 and uint16 types, as well as its own
pstring and fstring.
(This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f)
Diffstat (limited to 'source4/lib/genrand.c')
-rw-r--r-- | source4/lib/genrand.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/genrand.c b/source4/lib/genrand.c index 0f1d02b710..e3df9f9d90 100644 --- a/source4/lib/genrand.c +++ b/source4/lib/genrand.c @@ -22,10 +22,11 @@ #include "includes.h" #include "system/iconv.h" +#include "system/filesys.h" #include "lib/crypto/crypto.h" static unsigned char hash[258]; -static uint32 counter; +static uint32_t counter; static BOOL done_reseed = False; static void (*reseed_callback)(int *newseed); @@ -147,7 +148,7 @@ static void do_filehash(const char *fname, unsigned char *the_hash) static int do_reseed(BOOL use_fd, int fd) { unsigned char seed_inbuf[40]; - uint32 v1, v2; struct timeval tval; pid_t mypid; + uint32_t v1, v2; struct timeval tval; pid_t mypid; int reseed_data = 0; if (use_fd) { |