diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/g10.c | 12 | ||||
| -rw-r--r-- | g10/gpgv.c | 11 |
3 files changed, 13 insertions, 17 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 0579504da..21c44df4e 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2002-06-21 Stefan Bellon <[email protected]> + + * g10.c [__riscos__]: Moved RISC OS specific stuff to util/riscos.c + and include/util.h. + + * gpgv.c [__riscos__]: Likewise. + 2002-06-20 David Shaw <[email protected]> * keydb.h, pkclist.c (select_algo_from_prefs): Allow passing a @@ -28,10 +28,6 @@ #ifdef HAVE_DOSISH_SYSTEM #include <fcntl.h> /* for setmode() */ #endif -#ifdef __riscos__ -#include <unixlib/local.h> -#include <unixlib/features.h> -#endif /* __riscos__ */ #define INCLUDED_BY_MAIN_MODULE 1 #include "packet.h" @@ -600,8 +596,7 @@ static void add_notation_data( const char *string, int which ); static void add_policy_url( const char *string, int which ); #ifdef __riscos__ -/* This enables better dynamic memory management on RISC OS */ -const char *__dynamic_da_name = "GnuPG Heap"; +RISCOS_GLOBAL_STATICS("GnuPG Heap") #endif /* __riscos__ */ const char * @@ -872,10 +867,9 @@ main( int argc, char **argv ) #ifdef USE_SHM_COPROCESSING ulong requested_shm_size=0; #endif + #ifdef __riscos__ - /* set global RISC OS specific properties */ - __riscosify_control = __RISCOSIFY_NO_PROCESS; - __feature_imagefs_is_file = 1; + riscos_global_defaults(); opt.lock_once = 1; #endif /* __riscos__ */ diff --git a/g10/gpgv.c b/g10/gpgv.c index ac7b47887..362f5c528 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -28,10 +28,6 @@ #ifdef HAVE_DOSISH_SYSTEM #include <fcntl.h> /* for setmode() */ #endif -#ifdef __riscos__ -#include <unixlib/local.h> -#include <unixlib/features.h> -#endif /* __riscos__ */ #define INCLUDED_BY_MAIN_MODULE 1 #include "packet.h" @@ -83,8 +79,7 @@ static ARGPARSE_OPTS opts[] = { int g10_errors_seen = 0; #ifdef __riscos__ -/* This enables better dynamic memory management on RISC OS */ -const char *__dynamic_da_name = "GnuPG (gpgv) Heap"; +RISCOS_GLOBAL_STATICS("GnuPG (gpgv) Heap") #endif /* __riscos__ */ const char * @@ -144,9 +139,9 @@ main( int argc, char **argv ) STRLIST sl; STRLIST nrings=NULL; unsigned configlineno; + #ifdef __riscos__ - __riscosify_control = __RISCOSIFY_NO_PROCESS; - __feature_imagefs_is_file = 1; + riscos_global_defaults(); #endif /* __riscos__ */ log_set_name("gpgv"); |