Remove UXPDS support

2018-05-15 20:11:08 -05:00
parent 0f8233dadd
commit 8a4f389634
319 changed files with 317 additions and 8776 deletions
--- a/cde/programs/dtmail/MotifApp/Application.C
+++ b/cde/programs/dtmail/MotifApp/Application.C
@@ -254,7 +254,7 @@ Application::~Application()
    delete []_windows;

 #ifdef CDExc21492
-  #if defined(__hpux) || defined(USL) || defined(__uxp__)
+  #if defined(__hpux) || defined(USL)
    this->BasicComponent::~BasicComponent();
  #elif  __osf__
    BasicComponent * The_End = this;
--- a/cde/programs/dtmail/dtmail/AttachArea.C
+++ b/cde/programs/dtmail/dtmail/AttachArea.C
@@ -47,7 +47,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
 #define S_ISSOCK(mode) ((mode & S_IFMT) == S_IFSOCK)
 #endif
 #include <stdio.h>
--- a/cde/programs/dtmail/dtmail/AttachCmds.C
+++ b/cde/programs/dtmail/dtmail/AttachCmds.C
@@ -47,7 +47,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/stat.h>
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
 #define S_ISSOCK(mode) ((mode & S_IFMT) == S_IFSOCK)
 #endif
 #include <sys/types.h>
--- a/cde/programs/dtmail/dtmail/DmxMessage.C
+++ b/cde/programs/dtmail/dtmail/DmxMessage.C
@@ -74,7 +74,7 @@
 // For CHARSET
 #include <LocaleXlate.h>
 #include <locale.h>
-#if !defined(USL) && !defined(__uxp__)
+#if !defined(USL)
 #include <strings.h>
 #else 
 #include <EUSCompat.h>
--- a/cde/programs/dtmail/dtmail/RoamApp.C
+++ b/cde/programs/dtmail/dtmail/RoamApp.C
@@ -70,7 +70,7 @@

 #include <unistd.h>
 #include <wchar.h>
-#if defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
+#if defined(USL) || defined(linux) || defined(CSRG_BASED)
 #define wcswcs wcsstr
 #include <wctype.h>  // iswspace is defined in this header on USL */
 #endif
--- a/cde/programs/dtmail/dtmail/RoamMenuWindow.C
+++ b/cde/programs/dtmail/dtmail/RoamMenuWindow.C
@@ -72,11 +72,7 @@
 #include <unistd.h>
 #include <sys/param.h>

-#ifdef __uxp__
-#include <string.h>
-#endif
-
-#if !defined(USL) && !defined(__uxp__)
+#if !defined(USL)
 #include <strings.h>
 #endif
 #include <errno.h>
--- a/cde/programs/dtmail/dtmailpr/dmx.hh
+++ b/cde/programs/dtmail/dtmailpr/dmx.hh
@@ -96,7 +96,7 @@ enum DmxHeaders
 };

 // This is undoubtedly illegal, unethical, and immoral.  So sue me.
-#if !defined(SunOS) && !defined(USL) && !defined(_AIX) && !defined(__uxp__)
+#if !defined(SunOS) && !defined(USL) && !defined(_AIX)
 #undef boolean_t
 typedef enum { B_FALSE, B_TRUE } boolean_t;
 #endif // SunOS
--- a/cde/programs/dtmail/dtmailpr/message.C
+++ b/cde/programs/dtmail/dtmailpr/message.C
@@ -51,7 +51,7 @@
 // For CHARSET
 #include <DtHelp/LocaleXlate.h>
 #include <locale.h>
-#if !defined(USL) && !defined(__uxp__)
+#if !defined(USL)
 #include <strings.h>
 #else 
 #include <EUSCompat.h>
--- a/cde/programs/dtmail/include/DtMail/HashTable.hh
+++ b/cde/programs/dtmail/include/DtMail/HashTable.hh
@@ -56,9 +56,8 @@ class HashTableImpl : public DtCPlusPlusAllocator {
    virtual void * remove(ObjectKey & key);

 // HP can not support this construct.
-// UXP/DS can not support this construct either.
 //
-#if !defined(HPUX) && !defined(__uxp__)
+#if !defined(HPUX)
 //
 #define HASHTABLE_HASFOREACH

@@ -91,7 +90,7 @@ class HashTable : public DtCPlusPlusAllocator {

    Object remove(ObjectKey & key) { return( (Object)((long)_table.remove(key)) ); }

-#if !defined(HPUX) && !defined(__uxp__)
+#if !defined(HPUX)
    typedef int (*HashIterator)(ObjectKey &, Object, void * client_data);
    void forEach(HashTableImpl::HashImplIterator iterator, void * client_data) {
 	_table.forEach((HashTableImpl::HashImplIterator)iterator, client_data);
--- a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C
+++ b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C
@@ -154,8 +154,6 @@ struct cmd cmdtab[] = {
 #define SYSTEM_MAILRC	"/usr/share/lib/Mail.rc"
 #elif defined(USL) || defined(__hpux)
 #define SYSTEM_MAILRC	"/usr/share/lib/mailx.rc"
-#elif defined(__uxp__)
-#define SYSTEM_MAILRC	"/etc/mail/mailx.rc"
 #elif defined(CSRG_BASED)
 #define SYSTEM_MAILRC	"/etc/mail.rc"
 #endif
--- a/cde/programs/dtmail/libDtMail/Common/HashTable.C
+++ b/cde/programs/dtmail/libDtMail/Common/HashTable.C
@@ -189,7 +189,7 @@ HashTableImpl::remove(ObjectKey & key)
    return(removed_val);
 }

-#if !defined(HPUX) && !defined(__uxp__)
+#if !defined(HPUX)
 void
 HashTableImpl::forEach(HashImplIterator iterator, void * client_data)
 {
--- a/cde/programs/dtmail/libDtMail/Common/Process.C
+++ b/cde/programs/dtmail/libDtMail/Common/Process.C
@@ -51,7 +51,7 @@
 /*
 ** file included for INFTIM
 */ 
-#if defined(SunOS) || defined(USL) || defined(__uxp__)
+#if defined(SunOS) || defined(USL)
 #include <stropts.h>
 #elif defined(HPUX)
 #include <sys/poll.h>
--- a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
@@ -103,19 +103,12 @@ extern "C" {
 #define MAIL_SPOOL_PATH "/var/mail/%s"
 #endif

-#ifdef __uxp__
-extern "C" int madvise(caddr_t, size_t, int);
-extern "C" ssize_t  pread(int, void *, size_t, off_t);
-#endif
-
 #if defined(sun) || defined(USL)
 #define	LCL_SIG_HANDLER_SIGNATURE	
 #elif defined(__hpux)
 #define	LCL_SIG_HANDLER_SIGNATURE	__harg
 #elif defined(__aix) || defined(__alpha) || defined(linux) || defined(CSRG_BASED)
 #define	LCL_SIG_HANDLER_SIGNATURE	int
-#elif defined(__uxp__)
-#define	LCL_SIG_HANDLER_SIGNATURE
 #endif

 //
@@ -577,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(__uxp__) && !defined(linux) && !defined(sun)
+#if !defined(USL) && !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);
@@ -896,7 +889,7 @@ RFCMailBox::open(DtMailEnv & error,
 	  // five characters are "From "
 	  char inbuf[6];

-#if defined(sun) || defined(USL) || defined(__uxp__)
+#if defined(sun) || defined(USL)
 	  pread(_fd, (void *)inbuf, 5, 0);
 #else
 	  lseek(_fd, (off_t) 0L, SEEK_SET);
@@ -2266,7 +2259,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot)
    //
    unsigned long pagelimit = _mappings[map_slot]->map_size;

-#if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(sun)
+#if !defined(USL) && !defined(linux) && !defined(sun)
    // no madvise; dont use optimization
    madvise(
 	(char *)_mappings[map_slot]->map_region,
@@ -2357,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(__uxp__) && !defined(linux) && !defined(sun)
+#if !defined(USL) && !defined(linux) && !defined(sun)
    // no madvise; dont use optimization
    madvise(
 	(char *)_mappings[map_slot]->map_region,
--- a/cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C
@@ -47,7 +47,7 @@
 #include <EUSCompat.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(USL) && !defined(__uxp__)
+#if !defined(USL)
 #include <strings.h>
 #endif
 #include <ctype.h>
--- a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C
@@ -741,7 +741,7 @@ RFCTransport::launchSendmail(DtMailEnv & error,
    const char * mailer;
    _session->mailRc(error)->getValue(error, "sendmail", &mailer);
    if (error.isSet()) {
-#if defined(USL) || defined(__uxp__)
+#if defined(USL)
        mailer = "/usr/ucblib/sendmail";
 #elif defined(__OpenBSD__)
 	mailer = "/usr/sbin/sendmail";
--- a/cde/programs/dtmail/libDtMail/RFC/SunV3.C
+++ b/cde/programs/dtmail/libDtMail/RFC/SunV3.C
@@ -55,7 +55,7 @@
 /*
 ** file included for INFTIM
 */ 
-#if defined(SunOS) || defined (USL) || defined(__uxp__)
+#if defined(SunOS) || defined (USL)
 #include <stropts.h>
 #elif defined(HPUX)
 #include <sys/poll.h>