From b4c9e509be05fb692f0b8ca75ac862aa70c641ae Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 4 Sep 2007 18:59:05 +0000 Subject: [PATCH] Added macro to enabled the -J option even if not compiling under BeOS or MacOS. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22169 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/unzip/unzip.c | 2 +- src/bin/unzip/unzip.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/unzip/unzip.c b/src/bin/unzip/unzip.c index 1e62c3040c..4e599b84be 100644 --- a/src/bin/unzip/unzip.c +++ b/src/bin/unzip/unzip.c @@ -1239,7 +1239,7 @@ int uz_opts(__G__ pargc, pargv) else uO.jflag = TRUE; break; -#if (defined(__BEOS__) || defined(MACOS)) +#if (defined(__BEOS__) || defined(MACOS) || defined(HAS_JUNK_EXTRA_FIELD_OPTION)) case ('J'): /* Junk BeOS or MacOS file attributes */ if( negative ) { uO.J_flag = FALSE, negative = 0; diff --git a/src/bin/unzip/unzip.h b/src/bin/unzip/unzip.h index 28d38ad748..9f36ac95c7 100644 --- a/src/bin/unzip/unzip.h +++ b/src/bin/unzip/unzip.h @@ -422,7 +422,7 @@ typedef struct _UzpOpts { int scanimage; /* -I: scan image files */ #endif int jflag; /* -j: junk pathnames (unzip) */ -#if (defined(__BEOS__) || defined(MACOS)) +#if (defined(__BEOS__) || defined(MACOS) || defined(HAS_JUNK_EXTRA_FIELD_OPTION)) int J_flag; /* -J: ignore BeOS/MacOS extra field info (unzip) */ #endif int lflag; /* -12slmv: listing format (zipinfo) */