aboutsummaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/ChangeLog5
-rw-r--r--keyserver/gpgkeys_hkp.c8
-rw-r--r--keyserver/gpgkeys_ldap.c8
3 files changed, 5 insertions, 16 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index d58e505ad..f4e2387a8 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-28 Stefan Bellon <[email protected]>
+
+ * gpgkeys_hkp.c, gpgkeys_ldap.c [__riscos__]: Removal of
+ unnecessary #ifdef __riscos__ sections.
+
2003-11-27 Werner Koch <[email protected]>
* gpgkeys_hkp.c (get_key): Fixed invalid use of fprintf without
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 9e917578a..f8e9bc59b 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -55,10 +55,6 @@ struct keylist
struct keylist *next;
};
-#ifdef __riscos__
-RISCOS_GLOBAL_STATICS("HKP Keyfetcher Heap")
-#endif /* __riscos__ */
-
int
urlencode_filter( void *opaque, int control,
IOBUF a, byte *buf, size_t *ret_len)
@@ -748,10 +744,6 @@ 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,"hVo:"))!=-1)
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index ff42eff7b..7847292c5 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -60,10 +60,6 @@ struct keylist
struct keylist *next;
};
-#ifdef __riscos__
-RISCOS_GLOBAL_STATICS("LDAP Keyfetcher Heap")
-#endif /* __riscos__ */
-
int
ldap_err_to_gpg_err(int err)
{
@@ -808,10 +804,6 @@ main(int argc,char *argv[])
LDAPMessage *res;
struct keylist *keylist=NULL,*keyptr=NULL;
-#ifdef __riscos__
- riscos_global_defaults();
-#endif
-
console=stderr;
while((arg=getopt(argc,argv,"hVo:"))!=-1)