unifdef ISC

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

3 files changed, 7 insertions, 11 deletions

diff --git a/man.c b/man.c
index b430060..b176e19 100644
--- a/man.c
+++ b/man.c
@@ -437,7 +437,7 @@ ReadCurrentSection(Manual * local_manual, char *path)
  */
 
     if ((ptr = strrchr(path, '.')) != NULL) {
-#if !defined(__SCO__) && !defined(ISC)
+#if !defined(__SCO__)
         if (streq(ptr + 1, COMPRESSION_EXTENSION))
 #else
         if (strpbrk(ptr + 1, COMPRESSION_EXTENSIONS) != NULL)
@@ -483,7 +483,7 @@ ReadCurrentSection(Manual * local_manual, char *path)
  */
 
         if ((ptr = strrchr(full_name, '.')) != NULL) {
-#if !defined(__SCO__) && !defined(ISC)
+#if !defined(__SCO__)
             if (streq(ptr + 1, COMPRESSION_EXTENSION))
 #else
             if (strpbrk(ptr + 1, COMPRESSION_EXTENSIONS) != NULL)
diff --git a/misc.c b/misc.c
index fd5a3d2..e36d71d 100644
--- a/misc.c
+++ b/misc.c
@@ -60,7 +60,7 @@ static Boolean ConstructCommand(char *cmdbuf, const char *path,
                                 const char *filename, const char *tempfile);
 #endif
 
-#if defined(ISC) || defined(__SCO__) || defined(__UNIXWARE__)
+#if defined(__SCO__) || defined(__UNIXWARE__)
 static char *uncompress_format = NULL;
 
 static char *uncompress_formats[] = {
@@ -196,7 +196,7 @@ FindManualFile(ManpageGlobals * man_globals, int section_num, int entry_num)
     const char *entry = manual[section_num].entries[entry_num];
     int len_cat = strlen(CAT);
 
-#if defined(ISC) || defined(__SCO__) || defined(__UNIXWARE__)
+#if defined(__SCO__) || defined(__UNIXWARE__)
     int i;
 #endif
 
@@ -227,7 +227,7 @@ FindManualFile(ManpageGlobals * man_globals, int section_num, int entry_num)
  * Then for compressed files in an uncompressed directory.
  */
 
-#if !defined(ISC) && !defined(__UNIXWARE__)
+#if !defined(__UNIXWARE__)
 #if defined(__OpenBSD__) || defined(__NetBSD__)
     /* look in machine subdir first */
     snprintf(filename, sizeof(filename), "%s/%s%s/%s/%s.%s", path, CAT,
diff --git a/vendor.h b/vendor.h
index d217c2a..d763b50 100644
--- a/vendor.h
+++ b/vendor.h
@@ -91,13 +91,9 @@ from the X Consortium.
 #  define UNCOMPRESS_FORMAT       "pcat %s > %s"
 #  define NO_COMPRESS           /* mac can't handle using pack as a filter and
                                    xman needs it to be done that way. */
-#elif defined (ISC) || defined(__SCO__) || defined(__UNIXWARE__)
+#elif defined(__SCO__) || defined(__UNIXWARE__)
 #  define COMPRESSION_EXTENSION   "Z"           /* dummy */
-#  if !defined(__SCO__) && !defined(__UNIXWARE__)
-#    define COMPRESSION_EXTENSIONS  "zZF"       /* pack, compress, freeze */
-#  else
-#    define COMPRESSION_EXTENSIONS  "zZ"        /* pack, compress */
-#  endif
+#  define COMPRESSION_EXTENSIONS  "zZF"       /* pack, compress, freeze */
 #  define UNCOMPRESS_FORMAT       uncompress_format
 #  define UNCOMPRESS_FORMAT_1     "pcat %s > %s"
 #  define UNCOMPRESS_FORMAT_2     "zcat < %s > %s"