diff options
Diffstat (limited to 'tests/Service_Config_Test.cpp')
| -rw-r--r-- | tests/Service_Config_Test.cpp | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp index 6006d661a6f..1a9e4fe7817 100644 --- a/tests/Service_Config_Test.cpp +++ b/tests/Service_Config_Test.cpp @@ -122,29 +122,23 @@ run_test (int argc, ACE_TCHAR *argv[]) { ACE_ARGV new_argv; -#if defined (ACE_USES_WCHAR) - // When using full Unicode support, use the version of the Service - // Configurator file appropriate to the platform. - // For example, Windows Unicode uses UTF-16. - // - // iconv(1) found on Linux and Solaris, for example, can - // be used to convert between encodings. - // - // Byte ordering is also an issue, so we should be - // generating this file on-the-fly from the UTF-8 encoded - // file by using functions like iconv(1) or iconv(3). -# if defined (ACE_WIN32) const ACE_TCHAR svc_conf[] = +#if defined (ACE_USES_WCHAR) + // When using full Unicode support, use the version of the Service + // Configurator file that is UTF-16 encoded. + // + // @@ Note: Some platforms may want other encoding (e.g. UTF-32). + // + // iconv(1) found on Linux and Solaris, for example, can + // be used to convert between encodings. + // + // Byte ordering is also an issue, so we should be + // generating this file on-the-fly from the UTF-8 encoded + // file by using functions like iconv(1) or iconv(3). ACE_TEXT ("Service_Config_Test.UTF-16") ACE_TEXT (ACE_DEFAULT_SVC_CONF_EXT); -# else - const ACE_TCHAR svc_conf[] = - ACE_TEXT ("Service_Config_Test.WCHAR_T") - ACE_TEXT (ACE_DEFAULT_SVC_CONF_EXT); -# endif /* ACE_WIN32 */ #else // ASCII (UTF-8) encoded Service Configurator file. - const ACE_TCHAR svc_conf[] = ACE_TEXT ("Service_Config_Test") ACE_TEXT (ACE_DEFAULT_SVC_CONF_EXT); #endif /* ACE_USES_WCHAR */ |