diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-10-19 23:19:25 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-10-19 23:19:25 +0000 |
| commit | e3ff5e3f7fc148f5050b3e523b9983b6b08f0fb8 (patch) | |
| tree | ada618bf3b9eff95e9194141c822c4f7535ce237 /ace/config-win32-common.h | |
| parent | 9c2fe31511f7a9f89544b06bb2715cc9872049bd (diff) | |
| download | ATCD-e3ff5e3f7fc148f5050b3e523b9983b6b08f0fb8.tar.gz | |
Dave's wchar fixes
Diffstat (limited to 'ace/config-win32-common.h')
| -rw-r--r-- | ace/config-win32-common.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index dcee76dd553..7b171b5d98d 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -278,6 +278,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 @@ -285,12 +292,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 */ |