From 2cebba72749c7e564e62a997dd87f912962098c9 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 29 Mar 2022 12:07:18 +0900 Subject: [PATCH] gpg,tools: Remove use of repo only zlib-riscos.h. * g10/compress.c: Don't use zlib-riscos.h. * tools/gpgsplit.c: Likewise. -- Signed-off-by: NIIBE Yutaka --- g10/compress.c | 10 ---------- tools/gpgsplit.c | 9 --------- 2 files changed, 19 deletions(-) diff --git a/g10/compress.c b/g10/compress.c index 777ef47fb..9e094460f 100644 --- a/g10/compress.c +++ b/g10/compress.c @@ -32,9 +32,6 @@ #include #ifdef HAVE_ZIP # include -# if defined(__riscos__) && defined(USE_ZLIBRISCOS) -# include "zlib-riscos.h" -# endif #endif #include "gpg.h" @@ -63,13 +60,6 @@ init_compress( compress_filter_context_t *zfx, z_stream *zs ) int rc; int level; -#if defined(__riscos__) && defined(USE_ZLIBRISCOS) - static int zlib_initialized = 0; - - if (!zlib_initialized) - zlib_initialized = riscos_load_module("ZLib", zlib_path, 1); -#endif - if( opt.compress_level >= 1 && opt.compress_level <= 9 ) level = opt.compress_level; else if( opt.compress_level == -1 ) diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c index 93458068c..9ff24859a 100644 --- a/tools/gpgsplit.c +++ b/tools/gpgsplit.c @@ -34,9 +34,6 @@ #ifdef HAVE_ZIP # include #endif -#if defined(__riscos__) && defined(USE_ZLIBRISCOS) -# include "zlib-riscos.h" -#endif #define INCLUDED_BY_MAIN_MODULE 1 #include "../common/util.h" @@ -548,12 +545,6 @@ write_part (FILE *fpin, unsigned long pktlen, unsigned char *p; const char *outname = create_filename (pkttype); -#if defined(__riscos__) && defined(USE_ZLIBRISCOS) - static int initialized = 0; - - if (!initialized) - initialized = riscos_load_module("ZLib", zlib_path, 1); -#endif if (opt_no_split) fpout = stdout; else