Remove Unixware and openserver support

cde/lib/csa/agent.c

@@ -37,14 +37,14 @@
 #if !defined(linux) && !defined(CSRG_BASED)
 # include <poll.h>
 #endif
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 #include <netconfig.h>
 #include <netdir.h>
 #else
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
-#endif /* SunOS || USL */
+#endif /* SunOS */
 #include <X11/Intrinsic.h>
 
 #include "agent.h"
@@ -78,7 +78,7 @@ static int	mapped = 0;
 /******************************************************************************
  * forward declaration of static functions used within the file
  ******************************************************************************/
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 static u_long gettransient (u_long version);
 #else
 static u_long gettransient (int proto, u_long vers, int *sockp);
@@ -104,13 +104,13 @@ _DtCm_init_agent()
 {
 	int 		s = RPC_ANYSOCK;
 
-#if defined(SunOS) && SunOS < 55 || defined(USL)
+#if defined(SunOS) && SunOS < 55
 	extern boolean_t rpc_reg(const u_long, const u_long, const u_long,
 		const char *(*)(), const xdrproc_t, const xdrproc_t,
 		const char *);
 #endif
 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 	extern void (*sigset(int, void (*)(int)))(int);
 #else
 	extern void (*sigset())();
@@ -122,7 +122,7 @@ _DtCm_init_agent()
 
 	DP(("libdtcm: _DtCm_init_agent\n"));
 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 	(void)rpcb_unset(_DtCm_transient, AGENTVERS, NULL);
 	if ((_DtCm_transient = gettransient((u_long)1)) == 0) {
 		_DtCm_print_errmsg("Cannot get transient program number\n");
@@ -168,7 +168,7 @@ _DtCm_init_agent()
 		_DtCm_print_errmsg("Callback cannot be enabled.\n");
 	}
 
-#endif /* SunOS || USL */
+#endif /* SunOS */
  
 	/* locking candidate for MT-safe purpose */
 	mapped = 1;
@@ -185,13 +185,13 @@ _DtCm_destroy_agent()
 
 	DP(("libdtcm: _DtCm_destroy_agent\n"));
 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
         (void) rpcb_unset(_DtCm_transient, AGENTVERS, NULL);
         (void) rpcb_unset(_DtCm_transient, AGENTVERS_2, NULL);
 #else
         (void) pmap_unset(_DtCm_transient, AGENTVERS);
         (void) pmap_unset(_DtCm_transient, AGENTVERS_2);
-#endif /* SunOS || USL */
+#endif /* SunOS */
 
 	/* locking candidate for MT-safe purpose */
 	mapped = 0;
@@ -362,7 +362,7 @@ cmcb_update_callback_2_svc(cmcb_update_callback_args *args, struct svc_req *d)
 /*
  * get transient program number for callbacks.
  */
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 static u_long
 gettransient (u_long version)
 {
@@ -406,7 +406,7 @@ gettransient (u_long version)
 	return prognum;
 }
 
-#else /* SunOS || USL */
+#else /* SunOS */
 
 static u_long
 gettransient (int proto, u_long vers, int *sockp)
@@ -457,7 +457,7 @@ gettransient (int proto, u_long vers, int *sockp)
 	return (prognum-1);
 }
 
-#endif /* not SunOS || USL */
+#endif /* not SunOS */
 
 static void
 _DtCm_handle_callback()

cde/lib/csa/connection.c

@@ -113,7 +113,7 @@ _DtCm_create_udp_client(
 		return (CSA_SUCCESS);
 	}
 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 	cl = clnt_create_vers(host, TABLEPROG, 
 		&vers_out, TABLEVERS_2, version, "udp");
 	if (cl==NULL) {
@@ -208,7 +208,7 @@ _DtCm_create_tcp_client(
 		return (CSA_SUCCESS);
 	} else {
 		/* create tcp connection */
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 		cl = clnt_create_vers(host, TABLEPROG, &vers_out,
 			TABLEVERS_2, version, "tcp");
 #else
@@ -438,7 +438,7 @@ extern CSA_return_code
 _DtCm_clntstat_to_csastat(enum clnt_stat clntstat)
 {
 	switch (clntstat) {
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 	case RPC_N2AXLATEFAILURE:
 #endif
 	case RPC_UNKNOWNHOST:
@@ -461,7 +461,7 @@ create_auth(CLIENT *cl)
 {
 	/* Always cache the Unix style credentials. */
 	if (unix_credential == NULL)
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 		unix_credential = authsys_create_default ();
 #else
 		unix_credential = authunix_create_default ();
@@ -732,7 +732,7 @@ get_new_client_handle(_DtCm_Connection *conn)
 	oldver = conn->ci->vers_out;
 
 	/* always get a udp client handle first */
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 	cl = clnt_create_vers(conn->ci->host, TABLEPROG, &(conn->ci->vers_out),
 			TABLEVERS_2, oldver, "udp");
 	if (cl == NULL) {
@@ -788,7 +788,7 @@ get_new_client_handle(_DtCm_Connection *conn)
 
 		/* get a tcp client handle */
 		oldver = conn->ci->vers_out;
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 		cl = clnt_create_vers(conn->ci->host, TABLEPROG,
 			&(conn->ci->vers_out), TABLEVERS_2, oldver, "tcp");
 		if (cl == NULL)

cde/lib/csa/lutil.c

@@ -36,7 +36,7 @@
 #include <string.h>
 #include <rpc/rpc.h>
 #include <unistd.h>
-#if defined(sun) || defined(USL)
+#if defined(sun)
 #include <netdb.h>
 #include <sys/systeminfo.h>
 #endif
@@ -81,11 +81,11 @@ _DtCmGetLocalHost()
 
 	if (host == NULL) {
 		host = (char *)malloc(MAXHOSTNAMELEN+1);
-#if defined(sun) || defined(USL)
+#if defined(sun)
 		(void)sysinfo(SI_HOSTNAME, host, MAXHOSTNAMELEN);
 #else
 		(void)gethostname(host, MAXHOSTNAMELEN);
-#endif /* sun || USL */
+#endif /* sun */
 	}
 
 	return (host);
@@ -100,11 +100,11 @@ _DtCmGetLocalDomain(char *hostname)
 
 	if (domain == NULL) {
 		domain = (char *)malloc(BUFSIZ);
-#if defined(sun) || defined(USL)
+#if defined(sun)
 		sysinfo(SI_SRPC_DOMAIN, domain, BUFSIZ - 1);
 #else
 		getdomainname(domain, BUFSIZ - 1);
-#endif /* sun || USL */
+#endif /* sun */
 
 		/* check domain name */
 		/* this is a hack to find out the domain name that