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/lib/DtSvc/DtEncap/Symbolic.c
+++ b/cde/lib/DtSvc/DtEncap/Symbolic.c
@@ -32,10 +32,6 @@
 * (c) Copyright 1993, 1994 Novell, Inc.				*
 */

-#ifdef __osf__
-#define SBSTDINC_H_NO_REDEFINE
-#endif
-
 #include <Dt/UserMsg.h>

 #include <bms/sbport.h>		/* NOTE: sbport.h must be the first include. */
--- a/cde/lib/DtSvc/DtEncap/bmsglob.c
+++ b/cde/lib/DtSvc/DtEncap/bmsglob.c
@@ -32,11 +32,6 @@
 * (c) Copyright 1993, 1994 Novell, Inc.				*
 */

-#ifdef __osf__
-/* #define SBSTDINC_H_NO_INCLUDE */
-#define SBSTDINC_H_NO_REDEFINE
-#endif
-
 #include <bms/sbport.h>
 #include <bms/bms.h>

--- a/cde/lib/DtSvc/DtEncap/local.c
+++ b/cde/lib/DtSvc/DtEncap/local.c
@@ -35,12 +35,8 @@
 #define __need_timeval   /* Needed for "struct timeval" from <time.h>. */
 #define __need_fd_set

-#include <bms/sbport.h> 
-#ifdef __osf__
-#include <sys/time.h>     /* For declaration of select(). */
-#else
+#include <bms/sbport.h>
 #include <time.h>
-#endif
 #include <errno.h>
 #include <signal.h>

@@ -206,7 +202,7 @@ void local_channel_object_input_handler(void * client_data,
  timeout.tv_sec = 0;
  timeout.tv_usec = 0;
  
-#if defined(SVR4) || defined(__osf__) || defined(__hpux) || defined(__OpenBSD__) || defined(linux)
+#if defined(SVR4) || defined(__hpux) || defined(__OpenBSD__) || defined(linux)
  select(max_fds, (fd_set*)&read_fd_vect, NULL, (fd_set*)&except_fd_vect, &timeout);
 #else
  /* UX has select defined with int*, not fd_set* parms */
--- a/cde/lib/DtSvc/DtUtil1/CmdMain.c
+++ b/cde/lib/DtSvc/DtUtil1/CmdMain.c
@@ -998,7 +998,7 @@ _DtCmdCommandInvokerExecute (
      if (commandPid == 0) 
      {

-#if defined(__hp_osf) || defined(__osf__) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
         setsid() ;
 #else
         (void) setpgrp ();
--- a/cde/lib/DtSvc/DtUtil1/CmdProcess.c
+++ b/cde/lib/DtSvc/DtUtil1/CmdProcess.c
@@ -45,13 +45,9 @@
 #include <limits.h>
 #endif 

-#if defined(__hp_osf) || defined (__osf__)
-#include <sys/access.h>
-#else
 #if defined(__hpux)
 #include <sys/getaccess.h>
 #endif
-#endif

 #include <sys/socket.h>
 #include <netdb.h>
--- a/cde/lib/DtSvc/DtUtil1/DtsMM.h
+++ b/cde/lib/DtSvc/DtUtil1/DtsMM.h
@@ -47,11 +47,7 @@
 * file, and therefore affects the Xsession.src, Xreset.src, and
 * Xstartup.src scripts in dtlogin/config.
 */
-#ifdef __osf__
-# define _DTDTSMMTEMPDIR	"/var/tmp"
-#else
-# define _DTDTSMMTEMPDIR	"/tmp"
-#endif
+#define _DTDTSMMTEMPDIR	"/tmp"

 typedef	int	DtDtsMMSeqNo;		/* the order it occures in db */
 typedef	int	DtDtsMMFieldCount;	/* number of fields in record */
--- a/cde/lib/DtSvc/DtUtil2/XlationSvc.c
+++ b/cde/lib/DtSvc/DtUtil2/XlationSvc.c
@@ -2199,7 +2199,7 @@ int _DtXlateGetXlateEnv(
   /* then look up version number of execution host */
   if (ret_AppExecEnvVersion) 
   {
-#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(sun) || defined(_AIX) || defined(linux) || defined(CSRG_BASED)
      char version[SYS_NMLN+SYS_NMLN+2];
 #else
      char version[UTSLEN+UTSLEN+2];
--- a/cde/lib/DtSvc/include/bms/sbport.h
+++ b/cde/lib/DtSvc/include/bms/sbport.h
@@ -110,22 +110,6 @@
 #   define OSF_BUG
 #endif

-#if defined(__osf__) && !defined(__osf)
-#   define __osf
-#   define __sysv
-#   define OSF_BUG
-#   define __char_ptr_yytext
-#endif
-
-#if defined(osf) && !defined(__osf)
-#   define __osf
-#   define __sysv
-#   define __osfs700
-#   define OSF_BUG
-#   define __hp_color_object
-#   define __char_ptr_yytext
-#endif
-
 #ifdef __hpux 
 #   define __sysv
 /* __hp9000s300 or __hp9000s800 is defined by HP-UX cpp */
@@ -223,10 +207,6 @@
 /* ----------------------------------------------------------------- */

 #if defined(__need_timeval)		/* Get "struct timeval" */
-#   ifdef __osf
-#      define _OSF_SOURCE
-#      include <sys/time.h>
-#   endif
 #   ifdef __sun
 #      include <sys/time.h>
 #   endif
@@ -240,10 +220,6 @@


 #if defined(__need_fd_set)		/* Get "typedef struct fd_set" */
-#   ifdef __osf
-#      define _OSF_SOURCE
-#      include <sys/types.h>
-#   endif
 #   ifdef __apollo
 #       define _INCLUDE_BSD_SOURCE
 #       include "/bsd4.3/usr/include/sys/types.h"
@@ -255,9 +231,6 @@


 #if defined(__need_S_IF)		/* Get S_IFNWK, S_IFLNK */
-#   ifdef __osf
-#      define _OSF_SOURCE
-#   endif
 #   ifdef __apollo
 #      define _APOLLO_SOURCE
 #   endif
@@ -271,9 +244,6 @@
 #endif

 #if defined(__need_all_signals)		/* Get all SIGxxx values */
-#   ifdef __osf
-#      define _OSF_SOURCE
-#   endif
 #   ifdef __apollo
 #      define _APOLLO_SOURCE
 #      include "/bsd4.3/usr/include/sys/types.h"
@@ -285,7 +255,7 @@
 /* about above.  So, declare them only if we don't already have them */
 /* ----------------------------------------------------------------- */

-#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(_OSF_SOURCE) || defined(__aix) || defined(__osf__) || defined(linux)
+#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(__aix) || defined(linux)
       /* the "u_types" are defined in standard files */
 #      undef _INCLUDE_BSD_SOURCE
 #else
@@ -298,15 +268,11 @@
 /* Use these if you must ensure that  you get a specific number of bits */
 /* -------------------------------------------------------------------- */
 typedef char  int8;
-typedef short int16;			
-#ifndef __osf__
+typedef short int16;
 typedef long  int32;
-#endif
 typedef unsigned char  u_int8;
 typedef unsigned short u_int16;
-#ifndef __osf__
 typedef unsigned long  u_int32;
-#endif

 #define __xechar_is_signed
 #undef  __xechar_is_unsigned
--- a/cde/lib/DtSvc/include/bms/sbstdinc.h
+++ b/cde/lib/DtSvc/include/bms/sbstdinc.h
@@ -62,7 +62,7 @@
 #if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED)

 #if defined(__STDC__)
-#if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_) && !defined(sun)
+#if !defined(linux) && !defined(_XFUNCS_H_) && !defined(sun)
 extern void bcopy(char *b1, char *b2, int length);
 extern int  bcmp(char *b1, char *b2, int length);
 extern void bzero(char *b, int length);
@@ -70,7 +70,7 @@ extern void bzero(char *b, int length);

 extern char *mktemp(char *tmplate);
 #elif ! defined(__cplusplus)
-#if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_)
+#if !defined(linux) && !defined(_XFUNCS_H_)
 extern void bcopy();
 extern int  bcmp();
 extern void bzero();
@@ -224,12 +224,10 @@ extern size_t Xestrlen(ConstXeString s);
 #else
 extern size_t Xestrlen();
 #endif
-#ifndef __osf__
-# ifdef strlen
-#  undef strlen
-# endif
-# define strlen Xestrlen
+#ifdef strlen
+# undef strlen
 #endif
+#define strlen Xestrlen

 #if defined(__STDC__) || defined(__cplusplus)
 extern XeString Xestrdup(ConstXeString s);
--- a/cde/lib/DtSvc/include/codelibs/dynarray.h
+++ b/cde/lib/DtSvc/include/codelibs/dynarray.h
@@ -39,7 +39,7 @@
 #if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <generic.h>
 #endif
-#if defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
+#if defined(sun) || defined(linux) || defined(CSRG_BASED)
 #define _DELETE_ARRAY(sz) delete[]
 #else
 #define _DELETE_ARRAY(sz) delete[(sz)]
--- a/cde/lib/DtSvc/include/codelibs/privbuf.h
+++ b/cde/lib/DtSvc/include/codelibs/privbuf.h
@@ -48,9 +48,9 @@ typedef void (*privbuf_func)(void *v);
 #include <stddef.h>
 #include <stdlib.h>

-#if defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
-// The DEC C++ compiler rejects valid inline declarations, claiming
-// they have both internal and external linkage.
+#if defined(sun) || defined(linux) || defined(CSRG_BASED)
+// Rejects valid inline declarations, claiming they have both internal and
+// external linkage.
 #else
 inline static void *operator new(size_t size) { return malloc((unsigned)size); }
 inline static void operator delete(void *p) { if (p) free((char*)p); }
--- a/cde/lib/DtSvc/include/codelibs/stringx.h
+++ b/cde/lib/DtSvc/include/codelibs/stringx.h
@@ -54,9 +54,7 @@ extern "C"
 {
 #endif
 #if defined(__cplusplus) || defined(__STDC__)
-#if !defined(__osf__) && !defined(sun)
-    /* The DEC C++ compiler rejects this, claiming it has both */
-    /* internal and external linkage. */
+#if !defined(sun)
    char *strnew(size_t len);
    void strfree(const char *s);
 #endif
@@ -75,12 +73,10 @@ extern "C"

 #ifdef __cplusplus
    char *strtokx(char *&ptr, const char *sep);
-# if !defined(__osf__) && !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
+# if !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
    char **strsep(const char *str, const char *sep,
 	boolean whsp = TRUE, int *num = NULL);
-#  if !defined(__osf__)
    const char *strcmbn(const char **vec, const char *sep = " ");
-#  endif
 # endif

 #else /* __STDC__ */
@@ -89,9 +85,7 @@ extern "C"
    char **strsep(const char *str, const char *sep,
 	boolean whsp, int *num);
 #endif
-#ifndef __osf__
    const char *strcmbn(const char **vec, const char *sep);
-#endif

 #endif /* __STDC__ */

@@ -125,7 +119,7 @@ extern size_t     nl_strlen();		/* __OBSOLETE */
 #if defined(__cplusplus)
 }

-#if defined(apollo) || defined(__aix) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(apollo) || defined(__aix) || defined(linux) || defined(CSRG_BASED)
 #include <stdlib.h>
 #else
 #include <malloc.h>
@@ -137,7 +131,7 @@ inline void  strfree(const char *s)
 	{ if (s != NULL) free((char *)s); }
 #else
 inline void  strfree(const char *s)
-#if defined(__hpux) || defined(__osf__) || defined(CSRG_BASED)
+#if defined(__hpux) || defined(CSRG_BASED)
 	{ if (s != NULL) free((void *)s); }
 #else
 	{ if (s != NULL) free((void *)s); }