This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

1 files changed, 17 insertions, 49 deletions

diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl
index 549ea9530e8..c1e2b1535c7 100644
--- a/ace/OS_NS_unistd.inl
+++ b/ace/OS_NS_unistd.inl
@@ -118,8 +118,9 @@ ACE_OS::chdir (const char *path)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::change_dir ((char *) path), result),
                      int, -1);
 
-#elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  ACE_OSCALL_RETURN (::_chdir (const_cast<char *> (path)), int, -1);
+// This #elif seems weird... is Visual Age on NT not setting ACE_WIN32?
+#elif !defined (ACE_WIN32) && !defined (AIX) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
+  ACE_OSCALL_RETURN (::_chdir (path), int, -1);
 
 #elif defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (path);
@@ -145,7 +146,7 @@ ACE_OS::chdir (const wchar_t *path)
 #endif /* ACE_LACKS_CHDIR */
 
 ACE_INLINE int
-ACE_OS::rmdir (const char *path)
+ACE_OS::rmdir (const ACE_TCHAR * path)
 {
 #if defined (ACE_PSOS_LACKS_PHILE)
   ACE_UNUSED_ARG (path);
@@ -189,31 +190,16 @@ ACE_OS::rmdir (const char *path)
 #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
   ACE_OSCALL_RETURN (::_rmdir ((char *) path), int, -1);
 #elif defined (ACE_HAS_WINCE)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR (path)),
+  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (path, NULL),
                                           ace_result_),
                         int, -1);
+#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+  ACE_OSCALL_RETURN (::_wrmdir (path), int, -1);
 #else
   ACE_OSCALL_RETURN (::rmdir (path), int, -1);
 #endif /* ACE_HAS_PACE */
 }
 
-#if defined (ACE_HAS_WCHAR)
-ACE_INLINE int
-ACE_OS::rmdir (const wchar_t *path)
-{
-#if defined (ACE_HAS_WINCE)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (path),
-                                          ace_result_),
-                        int, -1);
-#elif defined (ACE_WIN32)
-  ACE_OSCALL_RETURN (::_wrmdir (path), int, -1);
-#else
-  ACE_Wide_To_Ascii n_path (path);
-  return ACE_OS::rmdir (n_path.char_rep ());
-#endif /* ACE_HAS_WINCE */
-}
-#endif /* ACE_HAS_WCHAR */
-
 // @todo: which 4 and why???  dhinton
 // NOTE: The following four function definitions must appear before
 // ACE_OS::sema_init ().
@@ -415,8 +401,8 @@ ACE_OS::ftruncate (ACE_HANDLE handle, off_t offset)
 #endif /* ACE_WIN32 */
 }
 
-ACE_INLINE char *
-ACE_OS::getcwd (char *buf, size_t size)
+ACE_INLINE ACE_TCHAR *
+ACE_OS::getcwd (ACE_TCHAR *buf, size_t size)
 {
   ACE_OS_TRACE ("ACE_OS::getcwd");
 #if defined (ACE_PSOS_LACKS_PHILE)
@@ -508,35 +494,16 @@ ACE_OS::getcwd (char *buf, size_t size)
   ACE_UNUSED_ARG (size);
   ACE_NOTSUP_RETURN (0);
 #elif defined (ACE_WIN32)
+#  if defined (ACE_USES_WCHAR)
+  return ::_wgetcwd (buf, static_cast<int> (size));
+#  else
   return ::getcwd (buf, static_cast<int> (size));
+#  endif /* ACE_USES_WCHAR */
 #else
   ACE_OSCALL_RETURN (::getcwd (buf, size), char *, 0);
 #endif /* ACE_PSOS_LACKS_PHILE */
 }
 
-#if defined (ACE_HAS_WCHAR)
-ACE_INLINE wchar_t *
-ACE_OS::getcwd (wchar_t *buf, size_t size)
-{
-#  if defined (ACE_HAS_WINCE)
-  ACE_UNUSED_ARG (buf);
-  ACE_UNUSED_ARG (size);
-  ACE_NOTSUP_RETURN (0);
-#  elif defined (ACE_WIN32)
-  return ::_wgetcwd (buf, ACE_static_cast (int, size));
-#  else
-  char *narrow_buf = new char[size];
-  char *result = 0;
-  result = ACE_OS::getcwd (narrow_buf, size);
-  ACE_Ascii_To_Wide wide_buf (result);
-  delete [] narrow_buf;
-  if (result != 0)
-    ACE_OS::strsncpy (buf, wide_buf.wchar_rep (), size);
-  return result == 0 ? 0 : buf;
-#  endif /* ACE_WIN32 */
-}
-#endif /* ACE_HAS_WCHAR */
-
 ACE_INLINE gid_t
 ACE_OS::getgid (void)
 {
@@ -562,6 +529,8 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
   ACE_UNUSED_ARG (argv);
   ACE_UNUSED_ARG (optstring);
   ACE_NOTSUP_RETURN (-1);
+# elif defined (ACE_LACKS_GETOPT_PROTO)
+  ACE_OSCALL_RETURN (::getopt (argc, (char**) argv, optstring), int, -1);
 # else
   ACE_OSCALL_RETURN (::getopt (argc, argv, optstring), int, -1);
 # endif /* VXWORKS */
@@ -1226,8 +1195,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename,
     }
   /* NOTREACHED */
 #elif !defined (ACE_LACKS_TRUNCATE)
-  ACE_OSCALL_RETURN
-    (::truncate (ACE_TEXT_ALWAYS_CHAR (filename), offset), int, -1);
+  ACE_OSCALL_RETURN (::truncate (filename, offset), int, -1);
 #else
   ACE_UNUSED_ARG (filename);
   ACE_UNUSED_ARG (offset);
@@ -1287,7 +1255,7 @@ ACE_OS::unlink (const char *path)
                      int, -1);
 # elif defined (ACE_HAS_WINCE)
   // @@ The problem is, DeleteFile is not actually equals to unlink. ;(
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_),
+  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (path), ace_result_),
                         int, -1);
 # elif defined (ACE_LACKS_UNLINK)
   ACE_UNUSED_ARG (path);