unifdef defined(SVR4) && !defined(sun)

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

2 files changed, 3 insertions, 22 deletions

diff --git a/vendor.c b/vendor.c
index 02f17f2..8735a5f 100644
--- a/vendor.c
+++ b/vendor.c
@@ -38,25 +38,6 @@ typedef struct sectionName {
     const char *suffix;
 } SectionNameRec;
 
-#if defined(SVR4) && !defined(sun)
-
-static SectionNameRec SectionNames[] = {
-    {"(1) User Commands",               "1"},
-    {"(1m) Sys, Administration",        "1m"},
-    {"(2) System Calls",                "2"},
-    {"(3) Subroutines",                 "3"},
-    {"(4) File Formats",                "4"},
-    {"(5) Miscellaneous",               "5"},
-    {"(6) Games",                       "6"},
-    {"(7) Devices",                     "7"},
-    {"(8) Sys. Administration",         "8"},
-    {"(l) Local",                       "l"},
-    {"(n) New",                         "n"},
-    {"(o) Old",                         "o"}
-};
-
-#else
-
 #if defined(sun) && defined(SVR4)
 /* losing man.cf is useless because it has no section names */
 
@@ -177,7 +158,7 @@ static SectionNameRec SectionNames[] = {
 };
 
 #endif
-#endif
+
 
 /*	Function Name: AddStandardSections
  *	Description: Adds all the standard sections to the list for this path.
diff --git a/vendor.h b/vendor.h
index d7dffd3..0051574 100644
--- a/vendor.h
+++ b/vendor.h
@@ -52,7 +52,7 @@ from the X Consortium.
 
 #define SEARCHDIR  MAN
 
-#if (defined(SVR4) && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) || defined(__CYGWIN__)
+#if (defined(BSD) && (BSD >= 199103)) || defined(linux) || defined(__CYGWIN__)
 # define SEARCHOTHER CAT
 #endif
 
@@ -70,7 +70,7 @@ from the X Consortium.
 #  define SYSMANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
 #elif defined(SVR4) && defined(sun)
 #  define SYSMANPATH "/usr/share/man:/usr/X11/man:/usr/openwin/share/man:/usr/dt/share/man:/usr/sfw/share/man"
-#elif defined(SVR4) || (defined(BSD) && (BSD >= 199103))
+#elif (defined(BSD) && (BSD >= 199103))
 #  define SYSMANPATH "/usr/share/man"
 #endif