diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-12-20 11:30:27 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-12-20 11:30:27 +0000 |
| commit | 79d6b545742956db1ddd5dd26965f666a3dff92c (patch) | |
| tree | 3762585bf8f0ac526d9dcbb26374225277ab5995 | |
| parent | 242264589652ef9dfe4fe8f7ee9faa455ab0a464 (diff) | |
| download | ATCD-79d6b545742956db1ddd5dd26965f666a3dff92c.tar.gz | |
ChangeLogTag: Mon Dec 20 11:30:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/OS_NS_unistd.inl | 23 | ||||
| -rw-r--r-- | ace/README | 2 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 1 |
3 files changed, 6 insertions, 20 deletions
diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl index 2985a0d0a17..bcacc17226d 100644 --- a/ace/OS_NS_unistd.inl +++ b/ace/OS_NS_unistd.inl @@ -184,8 +184,8 @@ ACE_OS::rmdir (const char *path) return (int) result; -#elif defined (VXWORKS) - ACE_OSCALL_RETURN (::rmdir ((char *) path), int, -1); +#elif defined (ACE_HAS_NONCONST_RMDIR) + ACE_OSCALL_RETURN (::rmdir (const_cast <char *> (path)), int, -1); #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) ACE_OSCALL_RETURN (::_rmdir ((char *) path), int, -1); #elif defined (ACE_HAS_WINCE) @@ -551,13 +551,11 @@ ACE_OS::getgid (void) # endif /* VXWORKS || ACE_PSOS */ } -#if !defined (ACE_WIN32) - ACE_INLINE int ACE_OS::getopt (int argc, char *const *argv, const char *optstring) { ACE_OS_TRACE ("ACE_OS::getopt"); -#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY) +#if defined (VXWORKS) || defined (ACE_PSOS) || defined (INTEGRITY) || defined (ACE_WIN32) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); ACE_UNUSED_ARG (optstring); @@ -567,21 +565,6 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring) # endif /* VXWORKS */ } -#else /* ACE_WIN32 */ - -ACE_INLINE int -ACE_OS::getopt (int argc, char *const *argv, const char *optstring) -{ - ACE_UNUSED_ARG (argc); - ACE_UNUSED_ARG (argv); - ACE_UNUSED_ARG (optstring); - - ACE_OS_TRACE ("ACE_OS::getopt"); - ACE_NOTSUP_RETURN (-1); -} - -#endif /* !ACE_WIN32 */ - ACE_INLINE pid_t ACE_OS::getpgid (pid_t pid) { diff --git a/ace/README b/ace/README index e3a594edef9..9bd700b2269 100644 --- a/ace/README +++ b/ace/README @@ -405,6 +405,8 @@ ACE_HAS_MUTEX_TIMEOUTS Compiler supports timed mutex ACE_HAS_NEW_NOTHROW Compiler offers new (nothrow). ACE_HAS_NONCONST_CHDIR Platform uses non-const char * in call to chdir +ACE_HAS_NONCONST_RMDIR Platform uses non-const char * + in call to rmdir ACE_HAS_NONCONST_GETBY Platform uses non-const char * in calls to gethostbyaddr, gethostbyname, getservbyname diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index adaa3603253..c3b30ffdc59 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -115,6 +115,7 @@ #define ACE_HAS_NONCONST_SWAB #define ACE_HAS_NONCONST_READV #define ACE_HAS_NONCONST_CHDIR +#define ACE_HAS_NONCONST_RMDIR #define ACE_LACKS_UNIX_SYSLOG #define ACE_HAS_MUTEX_TIMEOUTS #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768 |