summaryrefslogtreecommitdiff
path: root/ace/OS.h
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-08-02 22:49:17 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-08-02 22:49:17 +0000
commit387fc885a30e66974fea1e0e9ce5df78702a5647 (patch)
tree6f1d1a4bbea586b6794e2feb506a5b4200f05fcd /ace/OS.h
parent23212def6084085bb22c2bcf36aa83d5f87f6ad3 (diff)
downloadATCD-387fc885a30e66974fea1e0e9ce5df78702a5647.tar.gz
More UNICODE stuff to fix my previous fix
Diffstat (limited to 'ace/OS.h')
-rw-r--r--ace/OS.h14
1 files changed, 11 insertions, 3 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