Remove Unixware and openserver support

cde/programs/dtmail/libDtMail/Common/Buffer.C

@@ -46,13 +46,6 @@
 #include <string.h>
 #ifdef __osf__
 #include <stdlib.h>
-#else
-#if defined(USL) && (OSMAJORVERSION == 2)
-extern "C" {
-#endif
-#if defined(USL) && (OSMAJORVERSION == 2)
-};
-#endif
 #endif // __osf__
 #include <stdio.h>
 #include <stdlib.h>

cde/programs/dtmail/libDtMail/Common/DtMailRc.C

@@ -152,7 +152,7 @@ struct cmd cmdtab[] = {
 #define SYSTEM_MAILRC	"/etc/mail/mail.rc"
 #elif defined(_AIX) || defined(__osf__) || defined(linux)
 #define SYSTEM_MAILRC	"/usr/share/lib/Mail.rc"
-#elif defined(USL) || defined(__hpux)
+#elif defined(__hpux)
 #define SYSTEM_MAILRC	"/usr/share/lib/mailx.rc"
 #elif defined(CSRG_BASED)
 #define SYSTEM_MAILRC	"/etc/mail.rc"

cde/programs/dtmail/libDtMail/Common/DtMailServer.C

@@ -160,7 +160,7 @@ DtMailServer::set_password(char *password)
 //
 //	len	- Length of message.
 //
-#if defined(reallyoldsun) || defined(USL)
+#if defined(reallyoldsun)
 #define SA_HANDLER_TYPE void (*)(void)
 #else
 #define SA_HANDLER_TYPE void (*)(int)

cde/programs/dtmail/libDtMail/Common/Process.C

@@ -51,7 +51,7 @@
 /*
 ** file included for INFTIM
 */ 
-#if defined(SunOS) || defined(USL)
+#if defined(SunOS)
 #include <stropts.h>
 #elif defined(HPUX)
 #include <sys/poll.h>

cde/programs/dtmail/libDtMail/Common/Session.C

@@ -86,12 +86,6 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#if defined(USL) && (OSMAJORVERSION == 2)
-extern "C" {
-#endif
-#if defined(USL) && (OSMAJORVERSION == 2)
-};
-#endif
 #include <string.h>
 #include <pwd.h>
 #include <sys/socket.h>

cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C

@@ -103,7 +103,7 @@ extern "C" {
 #define MAIL_SPOOL_PATH "/var/mail/%s"
 #endif
 
-#if defined(sun) || defined(USL)
+#if defined(sun)
 #define	LCL_SIG_HANDLER_SIGNATURE	
 #elif defined(__hpux)
 #define	LCL_SIG_HANDLER_SIGNATURE	__harg
@@ -570,7 +570,7 @@ RFCMailBox::alterPageMappingAdvice(MapRegion *map, int advice)
   for (int m = 0; m < me; m++) {
     MapRegion *map_t = _mappings[m];
 
-#if !defined(USL) && !defined(linux) && !defined(sun)
+#if !defined(linux) && !defined(sun)
     // no madvise on these systems
     if (map_t == map || map == (MapRegion *)-1)
       madvise(map_t->map_region, (size_t) map_t->map_size, advice);
@@ -889,7 +889,7 @@ RFCMailBox::open(DtMailEnv & error,
 	  // five characters are "From "
 	  char inbuf[6];
 
-#if defined(sun) || defined(USL)
+#if defined(sun)
 	  pread(_fd, (void *)inbuf, 5, 0);
 #else
 	  lseek(_fd, (off_t) 0L, SEEK_SET);
@@ -2259,7 +2259,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot)
     //
     unsigned long pagelimit = _mappings[map_slot]->map_size;
 
-#if !defined(USL) && !defined(linux) && !defined(sun)
+#if !defined(linux) && !defined(sun)
     // no madvise; dont use optimization
     madvise(
 	(char *)_mappings[map_slot]->map_region,
@@ -2350,7 +2350,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot)
     // At this point we most likely will see random behavior. We will
     // tell the kernel to pull in the minimum number of extra pages.
     //
-#if !defined(USL) && !defined(linux) && !defined(sun)
+#if !defined(linux) && !defined(sun)
     // no madvise; dont use optimization
     madvise(
 	(char *)_mappings[map_slot]->map_region,
@@ -4539,7 +4539,7 @@ RFCMailBox::startAutoSave(DtMailEnv & error,
 	_session->removeEventRoutine(error, PollEntry, this);
 }
 
-#if defined(reallyoldsun) || defined(USL)
+#if defined(reallyoldsun)
 #define SA_HANDLER_TYPE void (*)(void)
 #else
 #define SA_HANDLER_TYPE void (*)(int)

cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C

@@ -47,9 +47,7 @@
 #include <EUSCompat.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(USL)
 #include <strings.h>
-#endif
 #include <ctype.h>
 #include <stdint.h>
 

cde/programs/dtmail/libDtMail/RFC/RFCTransport.C

@@ -741,9 +741,7 @@ RFCTransport::launchSendmail(DtMailEnv & error,
     const char * mailer;
     _session->mailRc(error)->getValue(error, "sendmail", &mailer);
     if (error.isSet()) {
-#if defined(USL)
-        mailer = "/usr/ucblib/sendmail";
-#elif defined(__OpenBSD__)
+#if defined(__OpenBSD__)
 	mailer = "/usr/sbin/sendmail";
 #else
         mailer = "/usr/lib/sendmail";

cde/programs/dtmail/libDtMail/RFC/SunV3.C

@@ -55,7 +55,7 @@
 /*
 ** file included for INFTIM
 */ 
-#if defined(SunOS) || defined (USL)
+#if defined(SunOS)
 #include <stropts.h>
 #elif defined(HPUX)
 #include <sys/poll.h>