ChangeLogTag: Wed May 12 09:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 3 insertions, 48 deletions

diff --git a/ace/os_include/sys/os_ipc.h b/ace/os_include/sys/os_ipc.h
index ee5d198048e..454c9e5b045 100644
--- a/ace/os_include/sys/os_ipc.h
+++ b/ace/os_include/sys/os_ipc.h
@@ -36,11 +36,11 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (ACE_WIN32) && !defined (ACE_PSOS)
+#if defined (ACE_WIN32)
 #  define ACE_INVALID_SEM_KEY 0
 #else /* !ACE_WIN32 */
 #  define ACE_INVALID_SEM_KEY -1
-#endif /* ACE_WIN32 && !ACE_PSOS */
+#endif /* ACE_WIN32 */
 
 #if !defined (IPC_PRIVATE)
 #  define IPC_PRIVATE ACE_INVALID_SEM_KEY
diff --git a/ace/os_include/sys/os_mman.h b/ace/os_include/sys/os_mman.h
index fea2f3e5a5e..6ccb58d548f 100644
--- a/ace/os_include/sys/os_mman.h
+++ b/ace/os_include/sys/os_mman.h
@@ -110,10 +110,6 @@ PAGE_NOCACHE  */
 #   define MS_SYNC 0x0
 # endif /* !MS_SYNC */
 
-#if defined (ACE_LACKS_MADVISE_PROTOTYPE)
-  int madvise(caddr_t, size_t, int);
-#endif
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/sys/os_socket.h b/ace/os_include/sys/os_socket.h
index 422ed15dec7..4949de012ad 100644
--- a/ace/os_include/sys/os_socket.h
+++ b/ace/os_include/sys/os_socket.h
@@ -96,18 +96,6 @@ extern "C"
 #  endif /* ACE_LACKS_CMSG_DATA_MACRO */
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
 
-#if defined (ACE_PSOS)
-   // Some versions have missing preprocessor definitions
-#  if !defined (AF_UNIX)
-#    define AF_UNIX 0x1
-#  endif /* AF_UNIX */
-#  define PF_UNIX AF_UNIX
-#  define PF_INET AF_INET
-#  if !defined (AF_MAX)
-#    define AF_MAX AF_INET
-#  endif /* AF_MAX */
-#endif /* ACE_PSOS */
-
 // Increase the range of "address families".  Please note that this
 // must appear _after_ the include of sys/socket.h, for the AF_FILE
 // definition on Linux/glibc2.
diff --git a/ace/os_include/sys/os_stat.h b/ace/os_include/sys/os_stat.h
index 605148b3b52..a8135b831d2 100644
--- a/ace/os_include/sys/os_stat.h
+++ b/ace/os_include/sys/os_stat.h
@@ -30,13 +30,6 @@
 #  include /**/ <direct.h>
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
 
-// This collides with phile.h on PSOS
-#if defined (ACE_PSOS)
-#  if !defined (ACE_LACKS_SYS_STAT_H)
-#    define ACE_LACKS_SYS_STAT_H
-#  endif /* !ACE_LACKS_SYS_STAT_H */
-#endif /* ACE_PSOS */
-
 #if !defined (ACE_LACKS_SYS_STAT_H)
 #  include /**/ <sys/stat.h>
 #endif /* !ACE_LACKS_SYS_STAT_H */
@@ -136,16 +129,6 @@ extern "C"
 #  endif
 #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
-   mode_t umask (mode_t);
-   int mkfifo (const char *, mode_t);
-   int mkdir (const char *, mode_t);
-#endif /* ACE_PSOS_SNARFS_HEADER_INFO */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/sys/os_types.h b/ace/os_include/sys/os_types.h
index fcc3610b074..83898698978 100644
--- a/ace/os_include/sys/os_types.h
+++ b/ace/os_include/sys/os_types.h
@@ -108,11 +108,6 @@ typedef double ACE_timer_t;
    typedef char *caddr_t;
 #endif /* ACE_WIN32 */
 
-#if defined (ACE_PSOS_TM)
-   typedef long long longlong_t;
-   typedef long      id_t;
-#endif /* ACE_PSOS_TM */
-
 #if defined (ACE_LACKS_KEY_T)
 #  if defined (ACE_WIN32)
    // Win32 doesn't use numeric values to name its semaphores, it uses
@@ -147,14 +142,7 @@ typedef double ACE_timer_t;
 
 #if defined (ACE_WIN32) && !defined(__MINGW32__)
    typedef long pid_t;
-#elif defined (ACE_PSOS) && (!defined (ACE_PSOSIM) && defined (ACE_PSOS_CANT_USE_SYS_TYPES))
-#  if defined (ACE_PSOS_DIAB_PPC)
-#    define ACE_INVALID_PID ((pid_t) ~0)
-#  else /* !defined (ACE_PSOS_DIAB_PPC) */
-     typedef long pid_t;
-#  endif /* defined (ACE_PSOS_DIAB_PPC) */
-   typedef char* caddr_t;
-#endif /* ACE_PSOS_CANT_USE_SYS_TYPES */
+#endif /* ACE_WIN32 */
 
 # if !defined (ACE_INVALID_PID)
 # define ACE_INVALID_PID ((pid_t) -1)