remove OSF1 support

2018-05-24 14:50:03 -05:00
parent 3c1736f077
commit 164e695cd0
325 changed files with 290 additions and 9980 deletions
--- a/cde/programs/dthelp/parser/canon1/helptag/global.h
+++ b/cde/programs/dthelp/parser/canon1/helptag/global.h
@@ -43,7 +43,7 @@
 #endif
 #include <ctype.h>

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #include <locale.h>
 #include <fcntl.h>
@@ -178,7 +178,7 @@ EXTERN char dirsep
 #if defined(MSDOS)
 INIT('\\')
 #else
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 INIT('/')
 #else
 ****define directory separator here****
@@ -186,7 +186,7 @@ INIT('/')
 #endif
  ;

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 #define CSEP '/'
 #define SSEP "/"
 #else
--- a/cde/programs/dthelp/parser/canon1/helptag/help.c
+++ b/cde/programs/dthelp/parser/canon1/helptag/help.c
@@ -61,7 +61,6 @@ m_free(string, "GetDefaultHeaderString return");

 /* Determine base name for files (i.e., input name without extension).
   Open output and error files */
-/* osf has the same function defined, change the routine name to fbasename() */
 void fbasename(M_NOPAR)
 {
 char *p, *q;
@@ -358,7 +357,7 @@ char *qualname;
 char *unqualname;
 #endif
 {
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)

 FILE *f;
 #endif
@@ -383,7 +382,7 @@ else

 fnp = fn;

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 qualname[0] = '\0';
 gp = qualname + strlen(qualname);
 roomleft = roomleft - strlen(qualname);
@@ -497,7 +496,7 @@ do  {
 while (1);
 *strrchr(qualname, CSEP) = '\0';

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 #else
 strupr ( qualname );
 #endif
--- a/cde/programs/dthelp/parser/canon1/helptag/help.if
+++ b/cde/programs/dthelp/parser/canon1/helptag/help.if
@@ -179,17 +179,6 @@
  m_free(wc_1,"wide character string");
  m_free(wc_2,"wide character string");
  }
-#else
-#if defined(__osf__)
-  {
-  M_WCHAR *wc_1, *wc_2;
-
-  wc_1 = MakeWideCharString("OSF1");
-  wc_2 = MakeWideCharString("m-machine");
-  m_piaction(wc_1, wc_2, M_SDATA) ;
-  m_free(wc_1,"wide character string");
-  m_free(wc_2,"wide character string");
-  }
 #else
  m_piaction("UNDEFINED MACHINE",
 	     "m-machine",
@@ -197,7 +186,6 @@
 #endif
 #endif
 #endif
-#endif
 #endif
  </CODE>

--- a/cde/programs/dthelp/parser/canon1/helptag/make.c
+++ b/cde/programs/dthelp/parser/canon1/helptag/make.c
@@ -36,14 +36,14 @@
 #include <sys\stat.h>
 #endif

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__)
+#if defined(hpux) || defined(_AIX) || defined(sun)
 #include <sys/types.h>
 #include <sys/stat.h>
 #endif

 #include <math.h>

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__)
+#if defined(hpux) || defined(_AIX) || defined(sun)
 #undef M_PI  /* M_PI is used by markup, we don't need the math PI */
 #endif

--- a/cde/programs/dthelp/parser/canon1/parser/parser.c
+++ b/cde/programs/dthelp/parser/canon1/parser/parser.c
@@ -90,7 +90,7 @@ static char sopt[] =
 static char name[] = "m_name = '%s'\n" ;
 static char literal[] = "m_literal = '%s'\n" ;

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux)
 char buffer[M_LITLEN + 80] ;
 #else
 #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d))
--- a/cde/programs/dthelp/parser/pass1/helptag/help.c
+++ b/cde/programs/dthelp/parser/pass1/helptag/help.c
@@ -357,7 +357,7 @@ char *qualname;
 char *unqualname;
 #endif
 {
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 FILE *f;
 #endif
 char fn[FNAMELEN];
@@ -381,7 +381,7 @@ else

 fnp = fn;

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 qualname[0] = '\0';
 gp = qualname + strlen(qualname);
 roomleft = roomleft - strlen(qualname);
@@ -495,7 +495,7 @@ do  {
 while (1);
 *strrchr(qualname, CSEP) = '\0';

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED)
 #else
 strupr ( qualname );
 #endif
--- a/cde/programs/dthelp/parser/pass1/helptag/help.if
+++ b/cde/programs/dthelp/parser/pass1/helptag/help.if
@@ -168,17 +168,6 @@
  m_free(wc_1,"wide character string");
  m_free(wc_2,"wide character string");
  }
-#else
-#if defined(__osf__)
-  {
-  M_WCHAR *wc_1, *wc_2;
-
-  wc_1 = MakeWideCharString("OSF1");
-  wc_2 = MakeWideCharString("m-machine");
-  m_piaction(wc_1, wc_2, M_SDATA) ;
-  m_free(wc_1,"wide character string");
-  m_free(wc_2,"wide character string");
-  }
 #else
  m_piaction("UNDEFINED MACHINE",
 	     "m-machine",
@@ -186,7 +175,6 @@
 #endif
 #endif
 #endif
-#endif
 #endif
  <\CODE>

--- a/cde/programs/dthelp/parser/pass1/helptag/make.c
+++ b/cde/programs/dthelp/parser/pass1/helptag/make.c
@@ -36,14 +36,14 @@
 #include <sys\stat.h>
 #endif

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__)
+#if defined(hpux) || defined(_AIX) || defined(sun)
 #include <sys/types.h>
 #include <sys/stat.h>
 #endif

 #include <math.h>

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__)
+#if defined(hpux) || defined(_AIX) || defined(sun)
 #undef M_PI  /* M_PI is used by markup, we don't need the math PI */
 #endif

--- a/cde/programs/dthelp/parser/pass1/parser/parser.c
+++ b/cde/programs/dthelp/parser/pass1/parser/parser.c
@@ -45,7 +45,7 @@ int main(argc, argv)
      "prevcon=%d,token=%d,curcon=%d,scanval='%c'(%d),line=%d,netlevel=%d\n" ;
    static char name[] = "m_name = '%s'\n" ;
    static char literal[] = "m_literal = '%s'\n" ;
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux)
    char buffer[M_LITLEN + 80] ;
 #else
 #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d))
--- a/cde/programs/dthelp/parser/pass2/htag2/option.c
+++ b/cde/programs/dthelp/parser/pass2/htag2/option.c
@@ -62,7 +62,7 @@ if (optfile = fopen(nameofoptfile, "r"))
    }
 m_free(nameofoptfile, "installation helptag.opt");

-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__)
+#if defined(hpux) || defined(_AIX) || defined(sun)
 {
 char *opts;

@@ -79,7 +79,7 @@ if (opts)
 	}
    }
 }
-#endif /* hpux or _AIX or sun or __osf__ */
+#endif /* hpux or _AIX or sun */

 /* Check helptag.opt in input directory */
 if (indir)
--- a/cde/programs/dthelp/parser/pass2/htag2/sdl.c
+++ b/cde/programs/dthelp/parser/pass2/htag2/sdl.c
@@ -26,13 +26,10 @@

 #include <sys/stat.h>
 #include <sys/wait.h>
-#if defined(__osf__) || defined(linux)
+#if defined(linux)
 #  include <sys/fcntl.h>
 #endif
-#if defined(__osf__)
-#  include <sys/access.h>
-#  include <locale.h>
-#endif /* __osf__ */
+
 #include <errno.h>

 #if defined(linux)
--- a/cde/programs/dthelp/parser/pass2/htag2/sdl.if
+++ b/cde/programs/dthelp/parser/pass2/htag2/sdl.if
@@ -1743,9 +1743,6 @@
  <START-CODE>
    if (firstVirpage)
 	{
-#ifdef __osf__
-#include <sys/fcntl.h>
-#endif /* __osf__ */
 	if (pCurrentElement)
 	    EmitSDL(pCurrentElement);
 	FcloseFile(outFile, vstructFileName, xxx);
--- a/cde/programs/dthelp/parser/pass2/parser/parser.c
+++ b/cde/programs/dthelp/parser/pass2/parser/parser.c
@@ -45,7 +45,7 @@ void main(argc, argv)
      "prevcon=%d,token=%d,curcon=%d,scanval='%c'(%d),line=%d,netlevel=%d\n" ;
    static char name[] = "m_name = '%s'\n" ;
    static char literal[] = "m_literal = '%s'\n" ;
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__)
+#if defined(hpux) || defined(_AIX) || defined(sun)
    char buffer[M_LITLEN + 80] ;
 #else
 #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d))