Remove apollo support

cde/lib/DtSvc/include/bms/sbport.h

@@ -46,7 +46,6 @@
 
  __hpux 		- Will be set for HP-UX systems
  __sun			- Will be set for SUN systems
- __apollo		- Will be set for APOLLO (domain) systems
  __aix                  - Will be set for IBM (AIX) systems
 
   __sysv		- Set when using SYSV semantics (e.g. HP, SUN)
@@ -62,13 +61,6 @@
  __sparc		- Set for SUN sparc machines
  __sun68k		- Set for SUN m68k machines
 
-
- __apollo88k		- Set for apollo (domain) risc (PRISM) machines
- __apollo68k		- Set for apollo (domain) m68k machines
- __apollo_null		- Set to allow null pointer dereferences on domain
-
- __apollo_paths		- Set to have "//<host>" converted to "host:" 
-
  __identification_strings - Set when RCS header strings are to be in code
  __recursive_includes	- Set to have .h files #includes prerequisite files
  __char_ptr_yytext      - Set if the lex/yacc variable yytext is defined
@@ -96,10 +88,6 @@
 #   define __sun
 #endif
 
-#if defined(apollo) && !defined(__apollo)
-#   define __apollo
-#endif
-
 #if defined(hpux) && !defined(__hpux)
 #   define __hpux
 #endif
@@ -135,32 +123,6 @@
 #   define __c_callable         /* Set so VUE can link with libbms. */
 #endif
 
-#ifdef __apollo
-#   ifndef __bsd
-#       define __sysv	/* NOTE: not bsd!!! */
-#   endif
-#   ifndef __apollo_paths
-#       define __apollo_paths
-#   endif
-#   ifndef __apollo_null
-#       define __apollo_null
-#   endif
-#   if defined(a88k) && !defined(__apollo88k)
-#      define __apollo88k
-#   endif
-#   if defined(_ISP__A88K) && !defined(__apollo88k)
-#      define __apollo88k
-#   endif
-#   if defined(m68k) && !defined(__apollo68k)
-#      define __apollo68k
-#   endif
-#   if defined(_ISP__M68K) && !defined(__apollo68k)
-#      define __apollo68k
-#   endif
-#   define __hp_color_object
-#   define __unsigned_char_ptr_yytext
-#endif
-
 #ifdef __aix
 #       define __sysv
 #endif
@@ -173,11 +135,6 @@
 #   define  KEEP_DEADWOOD FALSE		/* all sorts of unknown problems.    */
 #endif
 
-#ifndef __apollo_paths
-#   define __apollo_paths		/* We always want this feature */
-#endif
-
-
 #ifdef __cplusplus
 
 #define UNUSED_PARM(_parm)
@@ -207,49 +164,18 @@
 /* ----------------------------------------------------------------- */
 
 #if defined(__need_timeval)		/* Get "struct timeval" */
-#   ifdef __sun
-#      include <sys/time.h>
-#   endif
-#   ifdef __apollo
-#      include <sys/time.h>
-#   endif
-#   ifdef __aix
+#   if defined(__sun) || defined(__aix)
 #      include <sys/time.h>
 #   endif
 #endif /* __need_timeval */
 
 
 #if defined(__need_fd_set)		/* Get "typedef struct fd_set" */
-#   ifdef __apollo
-#       define _INCLUDE_BSD_SOURCE
-#       include "/bsd4.3/usr/include/sys/types.h"
-#   endif
 #   ifdef _AIX
 #       include <sys/select.h>
 #   endif
 #endif /* __need_fd_st */
 
-
-#if defined(__need_S_IF)		/* Get S_IFNWK, S_IFLNK */
-#   ifdef __apollo
-#      define _APOLLO_SOURCE
-#   endif
-#endif /* __need_S_IF */
-
-#if defined(__need_all_errors)
-#   ifdef __apollo
-#      define _APOLLO_SOURCE
-#      undef _SYS_STDSYMS_INCLUDED /* So we can include <sys/stdsyms.h> again */
-#   endif
-#endif
-
-#if defined(__need_all_signals)		/* Get all SIGxxx values */
-#   ifdef __apollo
-#      define _APOLLO_SOURCE
-#      include "/bsd4.3/usr/include/sys/types.h"
-#   endif
-#endif /* __need_all_signal */
-
 /* We also use the following non XPG3 types.  However, they may be   */
 /* defined when we relax the XPG3 compliance to get the stuff talked */
 /* about above.  So, declare them only if we don't already have them */

cde/lib/DtSvc/include/bms/sbstdinc.h

@@ -58,8 +58,8 @@
 /* Routines not defined in include files (yet).				*/
 /************************************************************************/
 
-/* Domain/OS BSD has bzero(), bcmp(), and bcopy() defined. */
-#if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED)
+/* BSD has bzero(), bcmp(), and bcopy() defined. */
+#if !defined(__bsd) && !defined(CSRG_BASED)
 
 #if defined(__STDC__)
 #if !defined(__linux__) && !defined(_XFUNCS_H_) && !defined(sun)

cde/lib/DtSvc/include/codelibs/mbstring.h

@@ -34,11 +34,6 @@
 
 #include <stddef.h>
 
-#ifdef apollo
-#define _NEED_WCHAR_T
-#include <sys/stdtypes.h>
-#endif
-
 #ifdef __cplusplus
 extern "C"
 {

cde/lib/DtSvc/include/codelibs/privbuf.h

@@ -34,13 +34,6 @@
 #ifndef __PRIVBUF_H_
 #define __PRIVBUF_H_
 
-#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
-#include "/usr/include/apollo/shlib.h"
-#endif
-#ifdef apollo
-#include <stdlib.h>
-#endif
-
 typedef void (*privbuf_func)(void *v);
 
 #ifdef __PRIVATE_

cde/lib/DtSvc/include/codelibs/stringx.h

@@ -32,13 +32,6 @@
 #ifndef __STRINGX_H_
 #define __STRINGX_H_
 
-#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
-#include "/usr/include/apollo/shlib.h"
-#endif
-#ifdef apollo
-#include <stdlib.h>
-#endif
-
 #include <stddef.h>
 #include <string.h>
 #include <codelibs/boolean.h>
@@ -119,11 +112,11 @@ extern size_t     nl_strlen();		/* __OBSOLETE */
 #if defined(__cplusplus)
 }
 
-#if defined(apollo) || defined(__aix) || defined(__linux__) || defined(CSRG_BASED)
+#if defined(__aix) || defined(__linux__) || defined(CSRG_BASED)
 #include <stdlib.h>
 #else
 #include <malloc.h>
-#endif /* apollo */
+#endif /* aix linux CSRG_BASED */
 
 inline char *strnew(size_t len) { return (char*)malloc(len + 1); }
 #if defined(sun) || defined(__sun)