summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog14
-rw-r--r--ace/OS_NS_dlfcn.inl2
-rw-r--r--ace/OS_NS_signal.inl4
-rw-r--r--ace/OS_NS_stdio.inl8
-rw-r--r--ace/OS_NS_sys_shm.inl4
-rw-r--r--ace/OS_NS_sys_socket.inl4
-rw-r--r--ace/OS_NS_unistd.inl18
-rw-r--r--ace/config-openvms.h5
-rw-r--r--ace/config-tandem-nsk-mips-v2.h4
9 files changed, 21 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog
index bb8e5125094..94d898f7c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Thu Jun 24 07:03:27 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ace/OS_NS_dlfcn.inl:
+ * ace/OS_NS_signal.inl:
+ * ace/OS_NS_stdio.inl:
+ * ace/OS_NS_sys_shm.inl:
+ * ace/OS_NS_sys_socket.inl:
+ * ace/OS_NS_unistd.inl:
+ * ace/config-openvms.h:
+ * ace/config-tandem-nsk-mips-v2.h:
+ Removed conditional code enabled by ACE_LACKS_POSIX_PROTOTYPES
+ and ACE_LACKS_SOME_POSIX_PROTOTYPES, as those macros have been
+ obsolete for some time.
+
Thu Jun 24 06:59:29 2004 J.T. Conklin <jtc@acorntoolworks.com>
* configure.ac:
diff --git a/ace/OS_NS_dlfcn.inl b/ace/OS_NS_dlfcn.inl
index ed3a95c609a..f939c41dcbe 100644
--- a/ace/OS_NS_dlfcn.inl
+++ b/ace/OS_NS_dlfcn.inl
@@ -220,7 +220,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
ACE_OSCALL_RETURN (::_dlsym (handle, symbolname), void *, 0);
# else
ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *, 0);
-# endif /* ACE_LACKS_POSIX_PROTOTYPES */
+# endif /* ACE_USES_ASM_SYMBOL_IN_DLSYM */
# elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE)
diff --git a/ace/OS_NS_signal.inl b/ace/OS_NS_signal.inl
index c21d41e77d9..e5fb4958df2 100644
--- a/ace/OS_NS_signal.inl
+++ b/ace/OS_NS_signal.inl
@@ -248,11 +248,7 @@ ACE_OS::sigprocmask (int how, const sigset_t *nsp, sigset_t *osp)
ACE_UNUSED_ARG (osp);
ACE_NOTSUP_RETURN (-1);
#else
-# if defined (ACE_LACKS_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::sigprocmask (how, (int*) nsp, osp), int, -1);
-# else
ACE_OSCALL_RETURN (::sigprocmask (how, nsp, osp), int, -1);
-# endif /* ACE_LACKS_POSIX_PROTOTYPES */
#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
}
diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl
index 470d6f479d0..d21702850e6 100644
--- a/ace/OS_NS_stdio.inl
+++ b/ace/OS_NS_stdio.inl
@@ -751,11 +751,7 @@ ACE_INLINE size_t
ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
{
ACE_OS_TRACE ("ACE_OS::fread");
-#if defined (ACE_LACKS_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::fread ((char *) ptr, size, nelems, fp), int, 0);
-#else
ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fread (ptr, size, nelems, fp), int, 0);
-#endif /* ACE_LACKS_POSIX_PROTOTYPES */
}
ACE_INLINE FILE *
@@ -811,11 +807,7 @@ ACE_INLINE size_t
ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp)
{
ACE_OS_TRACE ("ACE_OS::fwrite");
-#if defined (ACE_LACKS_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::fwrite ((const char *) ptr, size, nitems, fp), int, 0);
-#else
ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp), int, 0);
-#endif /* ACE_LACKS_POSIX_PROTOTYPES */
}
#if 0
diff --git a/ace/OS_NS_sys_shm.inl b/ace/OS_NS_sys_shm.inl
index 4de31f06737..255f84d6b2a 100644
--- a/ace/OS_NS_sys_shm.inl
+++ b/ace/OS_NS_sys_shm.inl
@@ -8,11 +8,7 @@ ACE_OS::shmat (int int_id, void *shmaddr, int shmflg)
{
ACE_OS_TRACE ("ACE_OS::shmat");
#if defined (ACE_HAS_SYSV_IPC)
-# if defined (ACE_LACKS_POSIX_PROTOTYPES) || defined (ACE_LACKS_SOME_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::shmat (int_id, (char *)shmaddr, shmflg), void *, (void *) -1);
-# else
ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char *> (shmaddr), shmflg), void *, (void *) -1);
-# endif /* ACE_LACKS_POSIX_PROTOTYPES */
#else
ACE_UNUSED_ARG (int_id);
ACE_UNUSED_ARG (shmaddr);
diff --git a/ace/OS_NS_sys_socket.inl b/ace/OS_NS_sys_socket.inl
index f4a3864b1e7..59930fb6319 100644
--- a/ace/OS_NS_sys_socket.inl
+++ b/ace/OS_NS_sys_socket.inl
@@ -531,11 +531,11 @@ ACE_OS::sendmsg (ACE_HANDLE handle,
}
else
return (ssize_t) bytes_sent;
-# elif defined (ACE_LACKS_POSIX_PROTOTYPES) || defined (ACE_PSOS)
+# elif defined (ACE_PSOS)
ACE_SOCKCALL_RETURN (::sendmsg (handle, (struct msghdr *) msg, flags), int, -1);
# else
ACE_SOCKCALL_RETURN (::sendmsg (handle, (ACE_SENDMSG_TYPE *) msg, flags), int, -1);
-# endif /* ACE_LACKS_POSIX_PROTOTYPES */
+# endif /* ACE_PSOS */
#else
ACE_UNUSED_ARG (flags);
ACE_UNUSED_ARG (msg);
diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl
index 7bbe4f6b1d9..c1e2b1535c7 100644
--- a/ace/OS_NS_unistd.inl
+++ b/ace/OS_NS_unistd.inl
@@ -290,8 +290,6 @@ ACE_OS::execv (const char *path,
# else
return ::_execv (path, (const char *const *) argv);
# endif /* __BORLANDC__ */
-#elif defined (ACE_LACKS_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::execv (path, (const char **) argv), int, -1);
#else
ACE_OSCALL_RETURN (::execv (path, argv), int, -1);
#endif /* ACE_LACKS_EXEC */
@@ -323,8 +321,6 @@ ACE_OS::execve (const char *path,
# else
return ::_execve (path, (const char *const *) argv, (const char *const *) envp);
# endif /* __BORLANDC__ */
-#elif defined (ACE_LACKS_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::execve (path, (const char **) argv, (char **) envp), int, -1);
#else
ACE_OSCALL_RETURN (::execve (path, argv, envp), int, -1);
#endif /* ACE_LACKS_EXEC */
@@ -354,8 +350,6 @@ ACE_OS::execvp (const char *file,
# else
return ::_execvp (file, (const char *const *) argv);
# endif /* __BORLANDC__ */
-#elif defined (ACE_LACKS_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::execvp (file, (const char **) argv), int, -1);
#else
ACE_OSCALL_RETURN (::execvp (file, argv), int, -1);
#endif /* ACE_LACKS_EXEC */
@@ -537,8 +531,6 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
ACE_NOTSUP_RETURN (-1);
# elif defined (ACE_LACKS_GETOPT_PROTO)
ACE_OSCALL_RETURN (::getopt (argc, (char**) argv, optstring), int, -1);
-# elif defined (ACE_LACKS_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::getopt (argc, (const char* const *) argv, optstring), int, -1);
# else
ACE_OSCALL_RETURN (::getopt (argc, argv, optstring), int, -1);
# endif /* VXWORKS */
@@ -855,11 +847,11 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len)
int result;
-# if defined (ACE_LACKS_POSIX_PROTOTYPES) || defined (ACE_HAS_CHARPTR_SOCKOPT)
+# if defined (ACE_HAS_CHARPTR_SOCKOPT)
ACE_OSCALL (::read (handle, (char *) buf, len), ssize_t, -1, result);
# else
ACE_OSCALL (::read (handle, buf, len), ssize_t, -1, result);
-# endif /* ACE_LACKS_POSIX_PROTOTYPES */
+# endif /* ACE_HAS_CHARPTR_SOCKOPT */
# if !(defined (EAGAIN) && defined (EWOULDBLOCK) && EAGAIN == EWOULDBLOCK)
// Optimize this code out if we can detect that EAGAIN ==
@@ -1318,15 +1310,13 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte)
return -1;
# endif /* defined (ACE_PSOS_LACKS_PHILE) */
#else
-# if defined (ACE_LACKS_POSIX_PROTOTYPES)
- ACE_OSCALL_RETURN (::write (handle, (const char *) buf, nbyte), ssize_t, -1);
-# elif defined (ACE_PSOS)
+# if defined (ACE_PSOS)
ACE_OSCALL_RETURN (::write_f(handle, (void *) buf, nbyte), ssize_t, -1);
# elif defined (ACE_HAS_CHARPTR_SOCKOPT)
ACE_OSCALL_RETURN (::write (handle, (char *) buf, nbyte), ssize_t, -1);
# else
ACE_OSCALL_RETURN (::write (handle, buf, nbyte), ssize_t, -1);
-# endif /* ACE_LACKS_POSIX_PROTOTYPES */
+# endif /* ACE_PSOS */
#endif /* ACE_WIN32 */
}
diff --git a/ace/config-openvms.h b/ace/config-openvms.h
index 5688f8841d8..2e29172d3a7 100644
--- a/ace/config-openvms.h
+++ b/ace/config-openvms.h
@@ -427,11 +427,6 @@
/*Platform lacks
pthread_attr_setsched()
(e.g. MVS)*/
-#define ACE_LACKS_SOME_POSIX_PROTOTYPES 1
- /*Platform lacks POSIX
- prototypes for certain System
- V functions like shared memory
- and message queues.*/
#define ACE_LACKS_SYSV_SHMEM 1
/*Platform lacks System V shared
memory (e.g., Win32 and
diff --git a/ace/config-tandem-nsk-mips-v2.h b/ace/config-tandem-nsk-mips-v2.h
index bd83f32b1a4..48a717756c1 100644
--- a/ace/config-tandem-nsk-mips-v2.h
+++ b/ace/config-tandem-nsk-mips-v2.h
@@ -294,10 +294,6 @@ extern int cma_sigwait (sigset_t *);
// Prototypes for both signal() and struct sigaction are consistent.
#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-// Platform lacks POSIX prototypes for certain System V functions like
-// shared memory and message queues.
-#define ACE_LACKS_SOME_POSIX_PROTOTYPES
-
// Platform supports the POSIX struct timespec type
#define ACE_HAS_POSIX_TIME
View Lorry Controller Status