diff options
| author | giovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-01 17:22:59 +0000 |
|---|---|---|
| committer | giovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-01 17:22:59 +0000 |
| commit | 726348347373fe64d12a61cbad3d51846eab9c58 (patch) | |
| tree | 6c4e39316c0b55f92f8ad08b4573a7dcf6f5d532 | |
| parent | 3a94ceb51c37784aeedc133eed0f7fea9691f595 (diff) | |
| download | ATCD-726348347373fe64d12a61cbad3d51846eab9c58.tar.gz | |
wchar fix
| -rw-r--r-- | Kokyu/tests/EDF/test.cpp | 2 | ||||
| -rw-r--r-- | Kokyu/tests/FIFO/test.cpp | 2 | ||||
| -rw-r--r-- | ace/ace_wchar.h | 5 | ||||
| -rw-r--r-- | ace/config-lynxos.h | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/Kokyu/tests/EDF/test.cpp b/Kokyu/tests/EDF/test.cpp index 769bda3fd71..b6bbe66a35c 100644 --- a/Kokyu/tests/EDF/test.cpp +++ b/Kokyu/tests/EDF/test.cpp @@ -138,7 +138,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR** argv) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Arg_Opt get_opts (argc, argv, ACE_TEXT("p:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:")); int c; while ((c = get_opts ()) != -1) diff --git a/Kokyu/tests/FIFO/test.cpp b/Kokyu/tests/FIFO/test.cpp index 80be0f4c779..fcda380ded6 100644 --- a/Kokyu/tests/FIFO/test.cpp +++ b/Kokyu/tests/FIFO/test.cpp @@ -142,7 +142,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR** argv) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Arg_Opt get_opts (argc, argv, ACE_TEXT("p:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:")); int c; while ((c = get_opts ()) != -1) diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index b73ed06f010..6d984e715c4 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -34,7 +34,10 @@ not supply them. # include /**/ <types/vxTypes.h> /* For wchar_t */ typedef wchar_t wint_t; typedef wchar_t wctype_t; - +# elif defined (__Lynx__) +# include /**/ <stdlib.h> /* For wchar_t */ + typedef unsigned int wint_t; + typedef wchar_t wctype_t; # elif defined (ACE_OPENVMS) # include /**/ <wchar.h> # include /**/ <wctype.h> diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h index ed9dd38bbd5..b2d723daa10 100644 --- a/ace/config-lynxos.h +++ b/ace/config-lynxos.h @@ -28,6 +28,11 @@ # define ACE_NEEDS_IPC_1C_H #endif /* ACE_LYNXOS_MAJOR */ +// Describe the native wchar_t +#define ACE_SIZEOF_WCHAR 4 +#define ACE_WCHAR_MAX 0x7fffffff +#define ACE_LACKS_BUILTIN_WCHAR_T + #if defined (__x86__) # define ACE_HAS_PENTIUM #elif defined (__powerpc__) |