diff options
| -rw-r--r-- | cipher/ChangeLog | 4 | ||||
| -rw-r--r-- | cipher/rand-internal.h | 2 | ||||
| -rw-r--r-- | keyserver/ChangeLog | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 8 | ||||
| -rw-r--r-- | util/ChangeLog | 8 | ||||
| -rw-r--r-- | util/fileutil.c | 4 | ||||
| -rw-r--r-- | util/secmem.c | 2 |
7 files changed, 32 insertions, 0 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index ebc7d2a7a..17ef1f94e 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,7 @@ +2002-09-12 Stefan Bellon <sbellon@sbellon.de> + + * rand-internal.h (rndriscos_gather_random): Added prototype. + 2002-08-30 Werner Koch <wk@gnupg.org> * random.c: Automagically detect the entropy gatherer when diff --git a/cipher/rand-internal.h b/cipher/rand-internal.h index 581902b2a..ab01bc6db 100644 --- a/cipher/rand-internal.h +++ b/cipher/rand-internal.h @@ -31,6 +31,8 @@ int rndw32_gather_random (void (*add)(const void*, size_t, int), int requester, size_t length, int level); int rndw32_gather_random_fast (void (*add)(const void*, size_t, int), int requester ); +int rndriscos_gather_random (void (*add)(const void*, size_t, int), + int requester, size_t length, int level); #endif /*G10_RAND_INTERNAL_H*/ diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index eb037717d..2cc21bfb6 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,7 @@ +2002-09-12 Stefan Bellon <sbellon@sbellon.de> + + * gpgkeys_hkp.c: Tidied up RISC OS initializations. + 2002-09-12 David Shaw <dshaw@jabberwocky.com> * gpgkeys_hkp.c (main): Remove warning - this is no longer diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index e5aaf6710..64e9318f2 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -46,6 +46,10 @@ struct keylist struct keylist *next; }; +#ifdef __riscos__ +RISCOS_GLOBAL_STATICS("HKP Keyfetcher Heap") +#endif /* __riscos__ */ + static int urlencode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len) @@ -639,6 +643,10 @@ int main(int argc,char *argv[]) int failed=0; struct keylist *keylist=NULL,*keyptr=NULL; +#ifdef __riscos__ + riscos_global_defaults(); +#endif + console=stderr; while((arg=getopt(argc,argv,"ho:"))!=-1) diff --git a/util/ChangeLog b/util/ChangeLog index 88c7eb105..fb596f34b 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,11 @@ +2002-09-12 Stefan Bellon <sbellon@sbellon.de> + + * fileutil.c (make_filename): Removed variable for RISC OS to + avoid compiler warning. + + * secmem.c: Removed static variable for RISC OS to avoid + compiler warning. + 2002-09-11 Werner Koch <wk@gnupg.org> * simple-gettext.c: Disable charset mappings. We do it now when diff --git a/util/fileutil.c b/util/fileutil.c index 76eacfb80..c2a2a9df2 100644 --- a/util/fileutil.c +++ b/util/fileutil.c @@ -99,7 +99,11 @@ make_filename( const char *first_part, ... ) va_list arg_ptr ; size_t n; const char *s; +#ifndef __riscos__ char *name, *home, *p; +#else + char *name, *p; +#endif va_start( arg_ptr, first_part ) ; n = strlen(first_part)+1; diff --git a/util/secmem.c b/util/secmem.c index 90fffd505..d077fed17 100644 --- a/util/secmem.c +++ b/util/secmem.c @@ -66,7 +66,9 @@ struct memblock_struct { static void *pool; static volatile int pool_okay; /* may be checked in an atexit function */ +#ifdef HAVE_MMAP static volatile int pool_is_mmapped; +#endif static size_t poolsize; /* allocated length */ static size_t poollen; /* used length */ static MEMBLOCK *unused_blocks; |