diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-16 12:58:13 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-16 12:58:13 +0000 |
| commit | 3c1e4636d70d08133459d75261f5b655caba863d (patch) | |
| tree | 2db35e76869cb106b4dd0878a5d8215fc294c2fe | |
| parent | 20fc84315d6c8922faad0ac2d6ae678d4096437b (diff) | |
| download | ATCD-3c1e4636d70d08133459d75261f5b655caba863d.tar.gz | |
Tue Sep 16 12:47:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.inl | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f6de805cdc8..86de47eee0c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 16 12:47:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_unistd.inl: + Reverted some wince changes + Tue Sep 16 12:48:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/checked_iterator.h: diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 16a5442bc32..a855688a17c 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -122,11 +122,7 @@ ACE_INLINE int ACE_OS::chdir (const char *path) { ACE_OS_TRACE ("ACE_OS::chdir"); -#if defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetCurrentDirectoryA (path), - ace_result_), - int, -1); -#elif defined (ACE_LACKS_CHDIR) +#if defined (ACE_LACKS_CHDIR) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_NONCONST_CHDIR) @@ -140,10 +136,9 @@ ACE_OS::chdir (const char *path) ACE_INLINE int ACE_OS::chdir (const wchar_t *path) { -#if defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetCurrentDirectoryW (path), - ace_result_), - int, -1); +#if defined (ACE_LACKS_CHDIR) + ACE_UNUSED_ARG (path); + ACE_NOTSUP_RETURN (-1); #elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wchdir (path), int, -1); #else /* ACE_WIN32 */ |