SCO port update for SCO OpenServer 5 and UnixWare 7. A few general cleanupssco_port_update

    and bugs not specifically related to the port fixed along the way.

4 files changed, 11 insertions, 11 deletions

diff --git a/man.c b/man.c
index b736351..8120048 100644
--- a/man.c
+++ b/man.c
@@ -437,7 +437,7 @@ ReadCurrentSection(Manual * local_manual, char * path)
  */
 
   if ( (ptr = rindex(path, '.')) != NULL) {
-#if !defined(SCO) && !defined(ISC)
+#if !defined(__SCO__) && !defined(ISC)
     if (streq(ptr + 1, COMPRESSION_EXTENSION)) 
 #else
     if (strpbrk(ptr + 1, COMPRESSION_EXTENSIONS) != NULL)
@@ -475,7 +475,7 @@ ReadCurrentSection(Manual * local_manual, char * path)
  */
 
     if ( (ptr = rindex(full_name, '.')) != NULL) {
-#if !defined(SCO) && !defined(ISC)
+#if !defined(__SCO__) && !defined(ISC)
       if (streq(ptr + 1, COMPRESSION_EXTENSION)) 
 #else
       if (strpbrk(ptr + 1, COMPRESSION_EXTENSIONS) != NULL)
diff --git a/misc.c b/misc.c
index e99aaa9..094fe5d 100644
--- a/misc.c
+++ b/misc.c
@@ -62,7 +62,7 @@ static Boolean UncompressUnformatted(ManpageGlobals * man_globals,
 static Boolean ConstructCommand(char * cmdbuf, char * path, char * filename, char * tempfile);
 #endif
 
-#if defined(ISC) || defined(SCO)
+#if defined(ISC) || defined(__USLC__) || defined(__SCO__)
 static char *uncompress_format = NULL;
 static char *uncompress_formats[] =
       {  UNCOMPRESS_FORMAT_1,
@@ -193,7 +193,7 @@ FindManualFile(ManpageGlobals * man_globals, int section_num, int entry_num)
   char filename[BUFSIZ];
   char * entry = manual[section_num].entries[entry_num];
   int len_cat = strlen(CAT);
-#if defined(ISC) || defined(SCO)
+#if defined(ISC) || defined(__USLC__)
   int i;
 #endif
 
@@ -224,7 +224,7 @@ FindManualFile(ManpageGlobals * man_globals, int section_num, int entry_num)
  * Then for compressed files in an uncompressed directory.
  */
 
-#if !defined(ISC) && !defined(SCO)
+#if !defined(ISC) && !defined(__USLC__)
 #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.c b/vendor.c
index 7754116..56257b3 100644
--- a/vendor.c
+++ b/vendor.c
@@ -55,7 +55,7 @@ static SectionNameRec SectionNames[] = {
     {"(l) Local",			"l"},
     {"(n) New",				"n"},
     {"(o) Old",				"o"}
-#ifdef SCO
+#ifdef __SCO__
       ,
       { "(ADM) System Administration", "ADM" },
       { "(ADMN) Network Administration", "ADMN" },
diff --git a/vendor.h b/vendor.h
index 030cfeb..7f4fc6c 100644
--- a/vendor.h
+++ b/vendor.h
@@ -78,7 +78,7 @@ from the X Consortium.
 #  define SYSMANPATH "/usr/share/man"
 #elif defined(hcx)
 #  define SYSMANPATH "/usr/catman/local_man:/usr/catman/u_man:/usr/catman/a_man:/usr/catman/p_man:/usr/catman/ada_man"
-#elif defined(SYSV) && defined(i386) && !defined(SCO)
+#elif defined(SYSV) && defined(i386) && !defined(__SCO__)
 #  define SYSMANPATH "/usr/catman/u_man:/usr/catman/p_man"
 #elif defined(sgi)
 #  define SYSMANPATH "/usr/catman/a_man:/usr/catman/g_man:/usr/catman/p_man:/usr/catman/u_man:/usr/man/p_man:/usr/man/u_man:/usr/man"
@@ -95,8 +95,8 @@ from the X Consortium.
  */
 
 #if defined( macII ) || defined( hcx ) || \
-	(defined(SYSV) && defined(i386) && !defined(ISC) && !defined(SCO)) || \
-	defined(sgi)
+	(defined(SYSV) && defined(i386) && !defined(ISC) && \
+	 !defined(__UNIXWARE__) && !defined(__SCO__)) || defined(sgi)
 #  define COMPRESSION_EXTENSION   "z"
 #  define UNCOMPRESS_FORMAT       "pcat %s > %s"
 #  define NO_COMPRESS		/* mac can't handle using pack as a filter and
@@ -105,9 +105,9 @@ from the X Consortium.
 #  define COMPRESSION_EXTENSION "C"
 #  define UNCOMPRESS_FORMAT     "ccat < %s > %s"
 #  define COMPRESS              "compact"
-#elif defined (ISC) || defined(SCO)
+#elif defined (ISC) || defined(__UNIXWARE__) || defined(__SCO__)
 #  define COMPRESSION_EXTENSION   "Z"     /* dummy */
-#  ifndef SCO
+#  if !defined(__USLC__) && !defined(__SCO__)
 #    define COMPRESSION_EXTENSIONS  "zZF" /* pack, compress, freeze */
 #  else
 #    define COMPRESSION_EXTENSIONS  "zZ"  /* pack, compress */