summaryrefslogtreecommitdiff
path: root/ace/config-win32-common.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/config-win32-common.h')
-rw-r--r--ace/config-win32-common.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 9b53c7143fd..bc8964d2ab9 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -295,6 +295,13 @@
#define ACE_UINT64_TYPE unsigned long long
#endif
+// ACE WChar support
+#define ACE_SIZEOF_WCHAR 2
+#define ACE_WCHAR_MAX 0xFFFF
+#if !defined(_NATIVE_WCHAR_T_DEFINED)
+# define ACE_LACKS_BUILTIN_WCHAR_T
+#endif
+
// Optimize ACE_Handle_Set for select().
#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
@@ -302,12 +309,6 @@
// is controlled in compiler configs since it's a compiler switch.
// Additionally, if the user selected use of wide chars (by setting either
// ACE_USES_WCHAR or UNICODE) make sure both are enabled.
-#define ACE_HAS_WCHAR
-#if defined (ACE_USES_WCHAR)
-# ifndef UNICODE
-# define UNICODE
-# endif
-#endif /* ACE_USES_WCHAR */
#if defined (UNICODE) && !defined (ACE_USES_WCHAR)
# define ACE_USES_WCHAR
#endif /* UNICODE && !ACE_USES_WCHAR */