ChangeLogTag: Fri May 5 07:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>Fri May 5 07:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

12 files changed, 34 insertions, 250 deletions

diff --git a/ChangeLog b/ChangeLog
index d78523e3bd3..180145f87a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Fri May  5 07:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_sys_utsname.cpp:
+        * ace/OS.h
+          Removed psos and chorus support
+
+        * ace/OS_NS_fcntl.cpp:
+        * ace/Lib_Find.cpp:
+        * ace/OS_NS_netdb.inl:
+          Removed psos support
+
+        * ace/Mem_Map.cpp:
+          Removed chorus support
+
+        * ace/IOStream.h:
+          Removed checks for KCC compiler
+
 Fri May  5 07:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Base_Thread_Adapter.h:
diff --git a/ace/os_include/os_dirent.h b/ace/os_include/os_dirent.h
index fc2bcb18575..74984acc7cb 100644
--- a/ace/os_include/os_dirent.h
+++ b/ace/os_include/os_dirent.h
@@ -45,13 +45,6 @@ extern "C"
 #  define MAXNAMLEN NAME_MAX
 #endif /* !MAXNAMLEN */
 
-# if defined (ACE_PSOS)
-// pHILE+ calls the DIR struct XDIR instead
-#    if !defined (ACE_PSOS_DIAB_PPC)
-typedef XDIR ACE_DIR;
-#    endif /* !defined (ACE_PSOS_DIAB_PPC) */
-# endif /* ACE_PSOS */
-
 // At least compile on some of the platforms without <ACE_DIR> info yet.
 #if !defined (ACE_HAS_DIRENT)
 typedef int ACE_DIR;
@@ -88,20 +81,6 @@ struct ACE_DIR {
   /// A flag to remember if we started reading already.
   int started_reading_;
 };
-#elif defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
-// Create our own definition of the DIR struct, like what
-// is available in the newer DIAB PPC header files
-struct ACE_DIR
-{
-  /// The directory handle
-  XDIR            xdir;
-
-  /// The directory entry
-  struct dirent   dirent;
-};
-
-#define ACE_DIRENT dirent
-
 #elif defined (ACE_WIN32) && (__BORLANDC__) && defined (ACE_USES_WCHAR)
 #define ACE_DIRENT wdirent
 typedef wDIR ACE_DIR;
diff --git a/ace/os_include/os_dlfcn.h b/ace/os_include/os_dlfcn.h
index bda2ca52acc..46c7a922259 100644
--- a/ace/os_include/os_dlfcn.h
+++ b/ace/os_include/os_dlfcn.h
@@ -66,11 +66,7 @@ extern "C"
 /* Also define a default 'mode' for loading a library - the names and values */
 /* differ between OSes, so if you write code that uses the mode, be careful */
 /* of the platform differences. */
-#if defined (ACE_PSOS)
-   typedef ACE_HANDLE ACE_SHLIB_HANDLE;
-#  define ACE_SHLIB_INVALID_HANDLE ACE_INVALID_HANDLE
-#  define ACE_DEFAULT_SHLIB_MODE 0
-#elif defined (ACE_WIN32)
+#if defined (ACE_WIN32)
    // Dynamic loading-related types - used for dlopen and family.
    typedef HINSTANCE ACE_SHLIB_HANDLE;
 #  define ACE_SHLIB_INVALID_HANDLE 0
@@ -78,22 +74,18 @@ extern "C"
 #elif defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
    typedef void *ACE_SHLIB_HANDLE;
 #  define ACE_SHLIB_INVALID_HANDLE 0
-#  if defined (__KCC) && defined(RTLD_GROUP) && defined(RTLD_NODELETE)
-#    define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GROUP | RTLD_NODELETE
-#  else
-     // This is needed to for dynamic_cast to work properly on objects passed to
-     // libraries.
-#    define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GLOBAL
-#  endif /* KCC */
+   // This is needed to for dynamic_cast to work properly on objects passed to
+   // libraries.
+#  define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GLOBAL
 #elif defined (__hpux)
    typedef shl_t ACE_SHLIB_HANDLE;
 #  define ACE_SHLIB_INVALID_HANDLE 0
 #  define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED
-#else /* !ACE_PSOS && !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING && !__hpux */
+#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING && !__hpux */
    typedef void *ACE_SHLIB_HANDLE;
 #  define ACE_SHLIB_INVALID_HANDLE 0
 #  define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY
-#endif /* ACE_PSOS */
+#endif /* ACE_WIN32 */
 
 #if !defined (RTLD_LAZY)
 #define RTLD_LAZY 1
diff --git a/ace/os_include/os_errno.h b/ace/os_include/os_errno.h
index b55cc024d31..9c9be161384 100644
--- a/ace/os_include/os_errno.h
+++ b/ace/os_include/os_errno.h
@@ -28,8 +28,8 @@
 # include /**/ <errno.h>
 #endif /* !ACE_LACKS_ERRNO_H */
 
-// Needed for VxWorks to pickup errnoSet()
 #if defined (ACE_VXWORKS)
+// Needed for VxWorks to pickup errnoSet()
 #include /**/ <errnoLib.h>
 #endif /* ACE_VXWORKS */
 
@@ -39,78 +39,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (ACE_PSOS)
-#  if !defined (EPERM)
-#    define EPERM        1        /* Not super-user                        */
-#  endif /* EPERM */
-#  if !defined (ENOENT)
-#    define ENOENT       2        /* No such file or directory             */
-#  endif /* ENOENT */
-#  if !defined (ESRCH)
-#    define ESRCH        3        /* No such process                       */
-#  endif /* ESRCH */
-#  if ! defined (EINTR)
-#    define EINTR        4        /* interrupted system call               */
-#  endif /* EINTR */
-#  if !defined (EBADF)
-#    define EBADF        9        /* Bad file number                       */
-#  endif /* EBADF */
-#  if !defined (EAGAIN)
-#    define EAGAIN       11       /* Resource temporarily unavailable      */
-#  endif /* EAGAIN */
-#  if !defined (EWOULDBLOCK)
-#    define EWOULDBLOCK  EAGAIN   /* Blocking resource request would block */
-#  endif /* EWOULDBLOCK */
-#  if !defined (ENOMEM)
-#    define ENOMEM       12       /* Not enough core                       */
-#  endif /* ENOMEM */
-#  if !defined (EACCES)
-#    define EACCES      13       /* Permission denied                     */
-#  endif /* EACCES */
-#  if !defined (EFAULT)
-#    define EFAULT       14       /* Bad access                            */
-#  endif /* EFAULT */
-#  if !defined (EEXIST)
-#    define EEXIST       17       /* File exists                           */
-#  endif /* EEXIST */
-#  if !defined (ENOSPC)
-#    define ENOSPC       28       /* No space left on device               */
-#  endif /* ENOSPC */
-#  if !defined (EPIPE)
-#    define EPIPE        32       /* Broken pipe                           */
-#  endif /* EPIPE */
-#  if !defined (ETIME)
-#    define ETIME        62       /* timer expired                         */
-#  endif /* ETIME */
-#  if !defined (ENAMETOOLONG)
-#    define ENAMETOOLONG 78       /* path name is too long                 */
-#  endif /* ENAMETOOLONG */
-#  if !defined (ENOSYS)
-#    define ENOSYS       89       /* Unsupported file system operation     */
-#  endif /* ENOSYS */
-#  if !defined (EADDRINUSE)
-#    define EADDRINUSE   125      /* Address already in use                */
-#  endif /* EADDRINUSE */
-#  if !defined (ENETUNREACH)
-#    define ENETUNREACH  128      /* Network is unreachable                */
-#  endif /* ENETUNREACH */
-#  if !defined (EISCONN)
-#    define EISCONN      133      /* Socket is already connected           */
-#  endif /* EISCONN */
-#  if !defined (ESHUTDOWN)
-#    define ESHUTDOWN    143      /* Can't send after socket shutdown      */
-#  endif /* ESHUTDOWN */
-#  if !defined (ECONNREFUSED)
-#    define ECONNREFUSED 146      /* Connection refused                    */
-#  endif /* ECONNREFUSED */
-#  if !defined (EINPROGRESS)
-#    define EINPROGRESS  150      /* operation now in progress             */
-#  endif /* EINPROGRESS */
-#  if !defined (ERRMAX)
-#    define ERRMAX       151      /* Last error number                     */
-#  endif /* ERRMAX */
-#endif /* ACE_PSOS */
-
 #if defined (ACE_WIN32)
    // error code mapping for windows
 #  define ETIME                   ERROR_SEM_TIMEOUT
@@ -152,9 +80,6 @@ extern "C"
    // Grrr! ENAMETOOLONG and ENOTEMPTY are already defined by the horrible
    // 'standard' library.
    // #define ENAMETOOLONG            WSAENAMETOOLONG
-#  if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
-#    define ENOTEMPTY               WSAENOTEMPTY
-#  endif /* __BORLANDC__  && __BORLANDC__ <= 0x540*/
 #  define EADDRINUSE WSAEADDRINUSE
 
   // CE needs this...
@@ -167,9 +92,9 @@ extern "C"
 void herror (const char *str);
 #endif /* ACE_HAS_H_ERRNO */
 
-#if !defined (ACE_WIN32) && !defined (ACE_PSOS) && defined (ACE_LACKS_T_ERRNO)
+#if !defined (ACE_WIN32) && defined (ACE_LACKS_T_ERRNO)
 extern int t_errno;
-#endif /* ACE_WIN32 && !ACE_PSOS && ACE_LACKS_T_ERRNO */
+#endif /* ACE_WIN32 && ACE_LACKS_T_ERRNO */
 
 #if !defined (ENOSYS)
 # define ENOSYS EFAULT /* Operation not supported or unknown error. */
diff --git a/ace/os_include/os_netdb.h b/ace/os_include/os_netdb.h
index b02ff121d63..34e006f0f26 100644
--- a/ace/os_include/os_netdb.h
+++ b/ace/os_include/os_netdb.h
@@ -49,24 +49,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (ACE_PSOS)
-   struct  hostent {
-     char    *h_name;        /* official name of host */
-     char    **h_aliases;    /* alias list */
-     int     h_addrtype;     /* host address type */
-     int     h_length;       /* address length */
-     char    **h_addr_list;  /* (first, only) address from name server */
-#    define h_addr h_addr_list[0]   /* the first address */
-   };
-
-  struct  servent {
-    char     *s_name;    /* official service name */
-    char    **s_aliases; /* alias list */
-    int       s_port;    /* port # */
-    char     *s_proto;   /* protocol to use */
-  };
-#endif /* ACE_PSOS */
-
 #if defined (ACE_HAS_STRUCT_NETDB_DATA)
    typedef char ACE_HOSTENT_DATA[sizeof(struct hostent_data)];
    typedef char ACE_SERVENT_DATA[sizeof(struct servent_data)];
diff --git a/ace/os_include/os_pthread.h b/ace/os_include/os_pthread.h
index a457271c9eb..a138fd2af0d 100644
--- a/ace/os_include/os_pthread.h
+++ b/ace/os_include/os_pthread.h
@@ -345,11 +345,7 @@ extern "C" pthread_t pthread_self (void);
 #    undef THR_DAEMON
 
 #    define THR_BOUND               0x00000001
-#    if defined (CHORUS)
-#      define THR_NEW_LWP             0x00000000
-#    else
-#      define THR_NEW_LWP             0x00000002
-#    endif /* CHORUS */
+#    define THR_NEW_LWP             0x00000002
 #    define THR_DETACHED            0x00000040
 #    define THR_SUSPENDED           0x00000080
 #    define THR_DAEMON              0x00000100
diff --git a/ace/os_include/os_signal.h b/ace/os_include/os_signal.h
index a38dcbfe754..ed583391cdb 100644
--- a/ace/os_include/os_signal.h
+++ b/ace/os_include/os_signal.h
@@ -52,13 +52,6 @@
 #  include /**/ <sigLib.h>
 #endif /* ACE_VXWORKS */
 
-// should this be extern "C" {}?
-#if defined (CHORUS)
-#     if  !defined(CHORUS_4)
-typedef void (*__sighandler_t)(int); // keep Signal compilation happy
-#     endif
-#endif /* CHORUS */
-
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
@@ -146,27 +139,15 @@ extern "C"
 #endif /* SIGALRM */
 
 #if !defined (SIG_DFL)
-#  if defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
-#    define SIG_DFL ((void *) 0)
-#  else
-#    define SIG_DFL ((__sighandler_t) 0)
-#  endif
+#  define SIG_DFL ((__sighandler_t) 0)
 #endif /* SIG_DFL */
 
 #if !defined (SIG_IGN)
-#  if defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
-#    define SIG_IGN ((void *) 1)     /* ignore signal */
-#  else
-#    define SIG_IGN ((__sighandler_t) 1)     /* ignore signal */
-#  endif
+#  define SIG_IGN ((__sighandler_t) 1)     /* ignore signal */
 #endif /* SIG_IGN */
 
 #if !defined (SIG_ERR)
-#  if defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
-#    define SIG_ERR ((void *) -1)    /* error return from signal */
-#  else
-#    define SIG_ERR ((__sighandler_t) -1)    /* error return from signal */
-#  endif
+#  define SIG_ERR ((__sighandler_t) -1)    /* error return from signal */
 #endif /* SIG_ERR */
 
 // These are used by the <ACE_IPC_SAP::enable> and
@@ -178,23 +159,9 @@ extern "C"
 # define ACE_SIGURG -2
 # define ACE_CLOEXEC -3
 
-#if defined (ACE_PSOS)
-#  if !defined (ACE_PSOSIM)
-     typedef void (* ACE_SignalHandler) (void);
-     typedef void (* ACE_SignalHandlerV) (void);
-#    if !defined(SIG_DFL)
-#      define SIG_DFL (ACE_SignalHandler) 0
-#    endif  /* philabs */
-#  endif /* !ACE_PSOSIM */
-#  if ! defined (NSIG)
-#    define NSIG 32
-#  endif /* NSIG */
-#endif /* ACE_PSOS && !ACE_PSOSIM */
-
-#if defined (VXWORKS)
+#if defined (ACE_VXWORKS)
 #  define ACE_NSIG (_NSIGS + 1)
 #elif defined (__Lynx__)
-   // LynxOS Neutrino sets NSIG to the highest-numbered signal.
 #  define ACE_NSIG (NSIG + 1)
 #elif defined (__rtems__)
 #  define ACE_NSIG (SIGRTMAX)
@@ -211,10 +178,8 @@ extern "C"
   //#  if defined (ACE_HAS_SIG_C_FUNC)
   //   extern "C" {
   //#  endif /* ACE_HAS_SIG_C_FUNC */
-#  if !defined (ACE_PSOS)
-     typedef void (*ACE_SignalHandler)(int);
-     typedef void (*ACE_SignalHandlerV)(int);
-#  endif /* !defined (ACE_PSOS) */
+  typedef void (*ACE_SignalHandler)(int);
+  typedef void (*ACE_SignalHandlerV)(int);
   //#  if defined (ACE_HAS_SIG_C_FUNC)
   //   }
   //#  endif /* ACE_HAS_SIG_C_FUNC */
@@ -296,10 +261,6 @@ extern "C"
      // <::_Psigwait> works with cxx -pthread.  g++ does _not_ need
      // it.
      int _Psigwait __((const sigset_t *set, int *sig));
-#  elif defined (__KCC)
-#    undef sigwait
-     inline int sigwait (const sigset_t* set, int* sig)
-       { return _Psigwait (set, sig); }
 #  endif /* __DECCXX_VER */
 #elif !defined (ACE_HAS_SIGWAIT)
 #  if defined(__rtems__)
diff --git a/ace/os_include/os_stdint.h b/ace/os_include/os_stdint.h
index 3d9327ac99a..97a6d4468d3 100644
--- a/ace/os_include/os_stdint.h
+++ b/ace/os_include/os_stdint.h
@@ -37,7 +37,6 @@ extern "C"
 // BSD style types
 #if defined (ACE_LACKS_SYS_TYPES_H) \
        || (defined (__GLIBC__) && !defined (_BSD_SOURCE))
-#  if ! defined (ACE_PSOS)
       typedef unsigned char u_char;
       typedef unsigned short u_short;
       typedef unsigned int u_int;
@@ -47,29 +46,8 @@ extern "C"
       typedef unsigned short ushort_t;
       typedef unsigned int  uint_t;
       typedef unsigned long ulong_t;
-#  endif /* ! defined (ACE_PSOS) */
 #endif  /* ACE_LACKS_SYS_TYPES_H */
 
-#if !defined (ACE_PSOSIM) && defined (ACE_PSOS_CANT_USE_SYS_TYPES)
-   // these are missing from the pSOS types.h file, and the compiler
-   // supplied types.h file collides with the pSOS version.
-#  if !defined (ACE_SHOULD_NOT_DEFINE_SYS_TYPES)
-     typedef unsigned char     u_char;
-     typedef unsigned short    u_short;
-#  endif /* ACE_SHOULD_NOT_DEFINE_SYS_TYPES */
-   typedef unsigned int      u_int;
-#  if !defined (ACE_SHOULD_NOT_DEFINE_SYS_TYPES)
-     typedef unsigned long     u_long;
-#  endif /* ACE_SHOULD_NOT_DEFINE_SYS_TYPES */
-   // These are defined in types.h included by (among others) pna.h
-#  if 0
-     typedef unsigned char     uchar_t;
-     typedef unsigned short    ushort_t;
-     typedef unsigned int      uint_t;
-     typedef unsigned long     ulong_t;
-#  endif /* 0 */
-#endif /* ACE_PSOS_CANT_USE_SYS_TYPES */
-
 /* Define required types if missing */
 
 #if defined (ACE_LACKS_INT8_T)
diff --git a/ace/os_include/os_stdlib.h b/ace/os_include/os_stdlib.h
index 91324a4f890..1a4be149d13 100644
--- a/ace/os_include/os_stdlib.h
+++ b/ace/os_include/os_stdlib.h
@@ -59,15 +59,6 @@ extern "C"
 #  endif /* HPUX_10 */
 #endif /* ACE_HAS_BROKEN_RANDR */
 
-#if defined (ACE_PSOS_SNARFS_HEADER_INFO)
-   // Header information snarfed from compiler provided header files
-   // that are not included because there is already an identically
-   // named file provided with pSOS, which does not have this info
-   // from compiler supplied header
-   int putenv (char *); // stdlib.h
-#endif /* ACE_PSOS_SNARFS_HEADER_INFO */
-
-
 #if defined (DIGITAL_UNIX)
   extern int _Prand_r (unsigned int *seedptr);
 #endif /* DIGITAL_UNIX */
diff --git a/ace/os_include/os_string.h b/ace/os_include/os_string.h
index 8fc7d30bb40..71b6f00464d 100644
--- a/ace/os_include/os_string.h
+++ b/ace/os_include/os_string.h
@@ -64,14 +64,6 @@ extern "C"
 #  define _strnicmp strnicmp
 #endif /* __BORLANDC__ */
 
-#if defined (ACE_PSOS_SNARFS_HEADER_INFO)
-   // Header information snarfed from compiler provided header files
-   // that are not included because there is already an identically
-   // named file provided with pSOS, which does not have this info
-   // from compiler supplied header
-   char *strdup (const char *);  // string.h
-#endif /* ACE_PSOS_SNARFS_HEADER_INFO */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h
index a6a4fabe69e..b948a7f2a0b 100644
--- a/ace/os_include/os_time.h
+++ b/ace/os_include/os_time.h
@@ -53,7 +53,7 @@ using std::timezone;
 using std::difftime;
 # endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */
 
-# if !defined (ACE_HAS_POSIX_TIME) && !defined (ACE_PSOS)
+# if !defined (ACE_HAS_POSIX_TIME)
 // Definition per POSIX.
 typedef struct timespec
 {
@@ -98,18 +98,6 @@ extern "C"
    extern char *strptime (const char *s, const char *fmt, struct tm *tp);
 #endif  /* ACE_LACKS_STRPTIME_PROTOTYPE */
 
-#if defined (ACE_PSOS) && !defined (USER_INCLUDE_SYS_TIME_TM)
-#  if defined (ACE_PSOS_DIAB_PPC)
-     typedef struct timespec timespec_t;
-#  else /* ! defined (ACE_PSOS_DIAB_PPC) */
-     typedef struct timespec
-     {
-       time_t tv_sec; // Seconds
-       long tv_nsec; // Nanoseconds
-     } timespec_t;
-#  endif /* defined (ACE_PSOS_DIAB_PPC) */
-#endif /*  defined (ACE_PSOS) && !defined (USER_INCLUDE_SYS_TIME_TM) */
-
 #if defined (ACE_LACKS_CONST_TIMESPEC_PTR)
 typedef struct timespec * ACE_TIMESPEC_PTR;
 #else
diff --git a/ace/os_include/os_unistd.h b/ace/os_include/os_unistd.h
index a60a3b18595..687557bfe26 100644
--- a/ace/os_include/os_unistd.h
+++ b/ace/os_include/os_unistd.h
@@ -91,14 +91,6 @@ extern "C"
 #   define F_OK    0       /* Test for existence of File. */
 # endif /* F_OK */
 
-#if defined (CHORUS)
-  int      getgid          __((void));
-  int      getuid          __((void));
-  char*    getcwd          __((char* buf, size_t size));
-  int      pipe            __((int* fildes));
-  int      gethostname     __((char*, size_t));
-#endif /* CHORUS */
-
 #if defined (ACE_LACKS_UALARM_PROTOTYPE)
    u_int ualarm (u_int usecs, u_int interval);
 #endif /* ACE_LACKS_UALARM_PROTOTYPE */
@@ -145,15 +137,6 @@ extern "C"
 #  define _isatty isatty
 #endif /* __BORLANDC__ */
 
-#if defined (ACE_PSOS_SNARFS_HEADER_INFO)
-   // Header information snarfed from compiler provided header files
-   // that are not included because there is already an identically
-   // named file provided with pSOS, which does not have this info
-   // from compiler supplied header
-   int getopt(int, char *const *, const char *);
-   int isatty (int h);
-#endif /* ACE_PSOS_SNARFS_HEADER_INFO */
-
 # if defined (ACE_LACKS_TIMEDWAIT_PROTOTYPES)
 
   ssize_t read_timedwait (ACE_HANDLE handle,