This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

1 files changed, 2 insertions, 12 deletions

diff --git a/ace/OS_NS_unistd.h b/ace/OS_NS_unistd.h
index bc75ef75be8..54200f5e648 100644
--- a/ace/OS_NS_unistd.h
+++ b/ace/OS_NS_unistd.h
@@ -74,12 +74,7 @@ namespace ACE_OS {
 #endif /* ACE_LACKS_CHDIR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int rmdir (const char *path);
-
-#if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int rmdir (const wchar_t *path);
-#endif /* ACE_HAS_WCHAR */
+  int rmdir (const ACE_TCHAR * path);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int close (ACE_HANDLE handle);
@@ -139,12 +134,7 @@ namespace ACE_OS {
                  off_t);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  char *getcwd (char *, size_t);
-
-#if defined (ACE_HAS_WCHAR)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *getcwd (wchar_t *, size_t);
-#endif /* ACE_HAS_WCHAR */
+  ACE_TCHAR *getcwd (ACE_TCHAR *, size_t);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   gid_t getgid (void);