More UNICODE stuff to fix my previous fix

2 files changed, 19 insertions, 5 deletions

diff --git a/ace/OS.h b/ace/OS.h
index 3be82d5e9d8..a568f75b4a2 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -4345,11 +4345,19 @@ typedef void *(*ACE_THR_C_FUNC)(void *);
 #   define MAP_FAILED ((void *) -1L)
 # endif /* !MAP_FAILED || ACE_HAS_BROKEN_MAP_FAILED */
 
-# if defined (ACE_HAS_CHARPTR_DL)
-typedef char * ACE_DL_TYPE;
+# if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
+#   if defined (ACE_HAS_CHARPTR_DL)
+typedef ASYS_TCHAR * ACE_DL_TYPE;
+#   else
+typedef const ASYS_TCHAR * ACE_DL_TYPE;
+#   endif /* ACE_HAS_CHARPTR_DL */
 # else
+#   if defined (ACE_HAS_CHARPTR_DL)
+typedef char * ACE_DL_TYPE;
+#   else
 typedef const char * ACE_DL_TYPE;
-# endif /* ACE_HAS_CHARPTR_DL */
+#   endif /* ACE_HAS_CHARPTR_DL */
+#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
 
 # if !defined (ACE_HAS_SIGINFO_T)
 struct ACE_Export siginfo_t
diff --git a/ace/OS.i b/ace/OS.i
index 5a066a9eb05..9533e5a6e36 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -8121,7 +8121,13 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   ACE_TRACE ("ACE_OS::dlsym");
 
   // Get the correct OS type.
-  ACE_DL_TYPE symbolname = ACE_const_cast (ACE_DL_TYPE, sname);
+#   if defined (ACE_HAS_CHARPTR_DL)
+typedef char * ACE_DL_SYM_TYPE;
+#   else
+typedef const char * ACE_DL_SYM_TYPE;
+#   endif /* ACE_HAS_CHARPTR_DL */
+
+  ACE_DL_SYM_TYPE symbolname = ACE_const_cast (ACE_DL_SYM_TYPE, sname);
 
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
 #   if defined (ACE_LACKS_POSIX_PROTOTYPES)
@@ -8151,7 +8157,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   ACE_WIN32CALL_RETURN (::GetProcAddress (handle,
                                           symbolname),
                         void *, 0);
-#   else /* ACE_HAS_WINCE */
+#   else  /* ACE_HAS_WINCE */
   ACE_WIN32CALL_RETURN (::GetProcAddress (handle,
                                           ACE_WIDE_STRING (symbolname)),
                         void *, 0);