diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-12-20 11:34:59 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-12-20 11:34:59 +0000 |
| commit | 405ea1bc787ff67ae49b28a72902161307cb047b (patch) | |
| tree | 9e70d73203181914fe51694f5d57ee970a7f6c66 | |
| parent | 79d6b545742956db1ddd5dd26965f666a3dff92c (diff) | |
| download | ATCD-405ea1bc787ff67ae49b28a72902161307cb047b.tar.gz | |
ChangeLogTag: Mon Dec 20 11:30:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/OS_NS_unistd.inl | 10 | ||||
| -rw-r--r-- | ace/README | 2 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl index bcacc17226d..561f3fad933 100644 --- a/ace/OS_NS_unistd.inl +++ b/ace/OS_NS_unistd.inl @@ -962,7 +962,7 @@ ACE_OS::sbrk (int brk) ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::sbrk (brk), void *, 0); -#endif /* VXWORKS */ +#endif /* ACE_LACKS_SBRK */ } ACE_INLINE int @@ -1262,13 +1262,13 @@ ACE_INLINE int ACE_OS::unlink (const char *path) { ACE_OS_TRACE ("ACE_OS::unlink"); -# if defined (VXWORKS) +# if defined (ACE_HAS_NONCONST_UNLINK) ACE_OSCALL_RETURN (::unlink (const_cast<char *> (path)), int, -1); # elif defined (ACE_PSOS) && ! defined (ACE_PSOS_LACKS_PHILE) - ACE_OSCALL_RETURN (::remove_f ((char *) path), int , -1); + ACE_OSCALL_RETURN (::remove_f (const_char <char *> (path)), int , -1); # elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_C_LIBRARY) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::remove ((char *) path), + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::remove (const_char <char *> (path)), result), int, -1); # elif defined (ACE_HAS_WINCE) @@ -1280,7 +1280,7 @@ ACE_OS::unlink (const char *path) ACE_NOTSUP_RETURN (-1); # else ACE_OSCALL_RETURN (::unlink (path), int, -1); -# endif /* VXWORKS */ +# endif /* ACE_HAS_NONCONST_UNLINK */ } #if defined (ACE_HAS_WCHAR) diff --git a/ace/README b/ace/README index 9bd700b2269..308810df18a 100644 --- a/ace/README +++ b/ace/README @@ -407,6 +407,8 @@ 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_UNLINK Platform uses non-const char * + in call to unlink 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 c3b30ffdc59..5dde38bde7e 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -116,6 +116,7 @@ #define ACE_HAS_NONCONST_READV #define ACE_HAS_NONCONST_CHDIR #define ACE_HAS_NONCONST_RMDIR +#define ACE_HAS_NONCONST_UNLINK #define ACE_LACKS_UNIX_SYSLOG #define ACE_HAS_MUTEX_TIMEOUTS #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768 |