Remove Unixware and openserver support

cde/programs/dtprintinfo/DtPrintinfo.C

@@ -45,7 +45,7 @@ nl_catd dtprintinfo_cat = NULL;
 #include <string.h> 
 #include <errno.h> 
 
-#if defined(aix) || defined(USL)
+#if defined(aix)
 extern "C" { extern int seteuid(uid_t); }
 #endif
 

cde/programs/dtprintinfo/Imakefile

@@ -55,10 +55,6 @@ AWK = nawk
 DEFINES = -DHAS_EXCEPTIONS
 #endif
 
-#ifdef USLArchitecture
-AWK = nawk
-#endif
-
 #ifdef AlphaArchitecture
 DEFINES = -D_TOOLTALK
 #endif

cde/programs/dtprintinfo/dtprintinfomsg.h

@@ -24,7 +24,6 @@
 #ifndef DTPRINTINFOMSG_H
 #define DTPRINTINFOMSG_H
 
-#if !defined(USL)
 /*
  * if __cplusplus is defined, the system header files take care
  * of themselves and putting this "extern C" here causes inconsistent linkage
@@ -33,17 +32,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#endif /* ! USL */
 
 #include <nl_types.h> 
 #include <locale.h> 
 
-#if defined(USL)
-#ifdef __cplusplus
-extern "C" {
-#endif
-#endif /* USL */
-
 #include "dtprintinfo_msg.h"
 #include "dtprintinfo_cat.h"
 

cde/programs/dtprintinfo/libUI/BaseUI.C

@@ -44,7 +44,7 @@
 #include <stdlib.h>
 #ifdef hpux
   #include <time.h>
-#elif defined(USL) || defined(__osf__) || defined(linux)
+#elif defined(__osf__) || defined(linux)
   #include <sys/time.h>
 #else
   #include <sys/select.h>
@@ -53,7 +53,7 @@
 #include <strings.h>            /* need to get bzero defined */
 #endif /* _AIX */
 
-#if defined(aix) || defined(USL)
+#if defined(aix)
 extern "C"
 {
 extern int strcasecmp(const char *,  const char *);

cde/programs/dtprintinfo/libUI/BaseUI.h

@@ -35,7 +35,7 @@
 
 #ifndef _BOOLEAN_
 #define _BOOLEAN_
-#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)|| defined(USL)
+#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)
   #include <sys/types.h>
   #define boolean boolean_t
   #define true B_TRUE

cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.C

@@ -35,12 +35,7 @@
 #include <Xm/List.h>
 #include <Xm/ComboBox.h>
 
-ComboBoxObj::ComboBoxObj(MotifUI *parent,
-#if defined(USL)
-			 void (*callback)(ComboBoxObj *, char *, int),
-#else
-			 ComboBoxCallback callback, 
-#endif
+ComboBoxObj::ComboBoxObj(MotifUI *parent, ComboBoxCallback callback,
                          char *name, 
 			 char **items, 
 			 int n_items)

cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.h

@@ -52,13 +52,8 @@ class ComboBoxObj : public MotifUI {
 
  public:
 
-#if defined(USL)
-   ComboBoxObj(MotifUI * parent, void (*)(ComboBoxObj *, char *, int),
-	       char *name, char **items, int n_items);
-#else
    ComboBoxObj(MotifUI * parent, ComboBoxCallback, char *name, 
 	       char **items, int n_items);
-#endif
 
    void Add(char *item);
    void Delete(char *item);

cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.h

@@ -33,10 +33,6 @@
 
 #include <Xm/Xm.h>
 
-#if defined(USL)
-#undef STRDUP  /* get rid of memutil.h definition. Use def in BaseUI.h. */
-#endif
-
 #include "BaseUI.h"
 #include "MotifThread.h"
 

cde/programs/dtprintinfo/objects/BaseObj.h

@@ -36,7 +36,7 @@
 
 #ifndef _BOOLEAN_
 #define _BOOLEAN_
-#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)|| defined(USL)
+#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)
   #include <sys/types.h>
   #define boolean boolean_t
   #define true B_TRUE

cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C

@@ -64,14 +64,14 @@ extern "C" in_addr_t inet_addr(const char *);
   #include <regex.h>
 #endif
 
-#if defined(aix) || defined(__osf__) || defined(USL)
+#if defined(aix) || defined(__osf__)
 extern "C" { int rresvport(int *); }
 #endif
 
 #ifdef hpux
   #define SETEUID(id) setresuid(getuid(), (uid_t)id, (uid_t)0);
 #else
-  #if defined(aix) || defined(USL)
+  #if defined(aix)
     extern "C" { extern int seteuid(uid_t); }
   #endif
   #define SETEUID(id) seteuid((uid_t)id)
@@ -177,15 +177,9 @@ int ConnectToPrintServer(const char *rhost, int timeout)
    int s, lport = IPPORT_RESERVED - 1;
 
    // Get the host address and port number to connect to.
-#if defined(USL) && OSMAJORVERSION > 1
-   if (!(hp = gethostbyname((char *) rhost)))
-    {
-      unsigned long tmpaddr = inet_addr((char *) rhost);
-#else
    if (!(hp = gethostbyname(rhost)))
     {
       unsigned long tmpaddr = inet_addr(rhost);
-#endif
       hp = gethostbyaddr((char *)&tmpaddr, sizeof(tmpaddr), AF_INET);
     }
    if (hp == NULL)
@@ -338,7 +332,7 @@ void LocalPrintJobs(char *printer, char **job_list, int *n_jobs)
 }
 #endif
 
-#if defined(sun) || defined(USL)
+#if defined(sun)
 
 // SUN LOCAL PARSER, actually this gets the local information from the file
 // system, it should have the good performance since no processes (lpstat)
@@ -672,7 +666,7 @@ static int SortJobs(const void *_first, const void *_second)
       return (int)((**first).secs - (**second).secs);
 }
 
-#endif // SUN and USL LOCAL PARSER
+#endif // SUN LOCAL PARSER
 
 #ifdef hpux
 

cde/programs/dtprintinfo/util/Invoke.C

@@ -116,8 +116,7 @@ Invoke::Invoke(const char *command,   // Command to Run
 
 #if defined(__OSF1__) || defined(__osf__) 
    action.sa_handler = (void (*)(int))SIG_IGN;
-#elif defined(USL) || \
-      ( defined(sun) && OSMAJORVERSION == 5 && OSMINORVERSION <= 4)
+#elif (defined(sun) && OSMAJORVERSION == 5 && OSMINORVERSION <= 4)
    action.sa_handler = (void (*)())SIG_IGN;
 #else
    action.sa_handler = SIG_IGN;