diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-21 21:01:51 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-21 21:01:51 +0000 |
| commit | 5e68c53ab1cc94e20b766355a5ff6b98fb7a75ae (patch) | |
| tree | 94a17f1479b91df4e52f25916a68091b7d41724e | |
| parent | fc08ae7c6cced597ea013432afa098db3a392002 (diff) | |
| download | ATCD-5e68c53ab1cc94e20b766355a5ff6b98fb7a75ae.tar.gz | |
ChangeLogTag:Wed Jul 21 15:54:25 1999 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ace/DLL.cpp | 5 | ||||
| -rw-r--r-- | ace/OS.cpp | 6 | ||||
| -rw-r--r-- | ace/OS.i | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/ace/DLL.cpp b/ace/DLL.cpp index 4e4e81858df..b4b5a715b21 100644 --- a/ace/DLL.cpp +++ b/ace/DLL.cpp @@ -21,7 +21,8 @@ ACE_DLL::ACE_DLL (int close_on_destruction) ACE_DLL::ACE_DLL (const char *dll_name, int open_mode, int close_on_destruction) - : handle_ (ACE_OS::dlopen (dll_name, open_mode)), + : handle_ (ACE_OS::dlopen (ASYS_WIDE_STRING (dll_name), + open_mode)), close_on_destruction_ (close_on_destruction) { if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) @@ -76,7 +77,7 @@ ACE_DLL::open (const char *dll_filename, return result; // The ACE_SHLIB_HANDLE object is obtained. - this->handle_ = ACE_OS::dlopen (ASYS_ONLY_MULTIBYTE_STRING (dll_pathname), + this->handle_ = ACE_OS::dlopen (dll_pathname, open_mode); if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) diff --git a/ace/OS.cpp b/ace/OS.cpp index 3f502f9edf0..f1dd9c50071 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -5195,14 +5195,16 @@ ACE_OS::difftime (time_t t1, time_t t0) # endif /* ACE_LACKS_DIFFTIME */ # if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -# if defined (ACE_HAS_WINCE) wchar_t * ACE_OS::ctime (const time_t *t) { +#if defined (ACE_HAS_WINCE) wchar_t buf[26]; // 26 is a "magic number" ;) return ACE_OS::ctime_r (t, buf, 26); +#else + ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0); +#endif /* ACE_HAS_WINCE */ } -# endif /* ACE_HAS_WINCE */ wchar_t * ACE_OS::ctime_r (const time_t *clock, @@ -8119,7 +8119,9 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *, 0); # endif /* ACE_LACKS_POSIX_PROTOTYPES */ # elif defined (ACE_WIN32) - ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0); + ACE_WIN32CALL_RETURN (::GetProcAddress (handle, + ASYS_ONLY_MULTIBYTE_STRING (symbolname)), + void *, 0); # elif defined (__hpux) void *value; @@ -8841,7 +8843,7 @@ ACE_OS::difftime (time_t t1, time_t t0) } #endif /* ! ACE_LACKS_DIFFTIME */ -#if !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS) ACE_INLINE char * ACE_OS::ctime (const time_t *t) { @@ -8854,7 +8856,9 @@ ACE_OS::ctime (const time_t *t) ACE_OSCALL_RETURN (::ctime (t), char *, 0); # endif /* ACE_HAS_BROKEN_CTIME) */ } +#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ +#if !defined (ACE_HAS_WINCE) ACE_INLINE char * ACE_OS::ctime_r (const time_t *t, char *buf, int buflen) { |