diff options
| author | giovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-14 14:50:08 +0000 |
|---|---|---|
| committer | giovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-14 14:50:08 +0000 |
| commit | efa7b9c56369266c66f6a2b4a9f9103eaa3f259b (patch) | |
| tree | b4f3f38f002dcbb9030d0b3236664f94b1270810 | |
| parent | 012532047ec879f7f62121d1c9e049ff91e34455 (diff) | |
| download | ATCD-efa7b9c56369266c66f6a2b4a9f9103eaa3f259b.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ace/OS_NS_Thread.inl | 2 | ||||
| -rw-r--r-- | ace/OS_NS_stdlib.h | 2 | ||||
| -rw-r--r-- | ace/OS_NS_string.inl | 3 | ||||
| -rw-r--r-- | ace/ace_wchar.h | 2 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 3 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl index bde9fa981e4..d81b0c88966 100644 --- a/ace/OS_NS_Thread.inl +++ b/ace/OS_NS_Thread.inl @@ -3500,7 +3500,7 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg, 0, lock_type); # elif defined (VXWORKS) || defined (ACE_PSOS) - return mutex_init (m, type, name, arg); + return mutex_init (m, lock_type, name, arg); # endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */ diff --git a/ace/OS_NS_stdlib.h b/ace/OS_NS_stdlib.h index bed4e867439..fd3a125790e 100644 --- a/ace/OS_NS_stdlib.h +++ b/ace/OS_NS_stdlib.h @@ -234,11 +234,9 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION unsigned long strtoul (const char *s, char **ptr, int base); -#if !defined (ACE_LACKS_WCSTOUL) /// Converts a string to an unsigned long value (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION unsigned long strtoul (const wchar_t *s, wchar_t **ptr, int base); -#endif /* !ACE_LACKS_WCSTOUL */ #if defined (ACE_LACKS_STRTOUL) extern ACE_Export diff --git a/ace/OS_NS_string.inl b/ace/OS_NS_string.inl index 6b27bce3bd9..38d465820e4 100644 --- a/ace/OS_NS_string.inl +++ b/ace/OS_NS_string.inl @@ -385,8 +385,7 @@ ACE_OS::strtok (wchar_t *s, const wchar_t *tokens) return ::wcstok (s, tokens); #else ACE_UNUSED_ARG( s ); - ACE_UNUSED_ARG( ptr ); - ACE_UNUSED_ARG( base ); + ACE_UNUSED_ARG( tokens ); ACE_NOTSUP_RETURN (0); #endif /* ACE_HAS_3_PARAM_WCSTOK */ } diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index 6d984e715c4..32cfaafc838 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -32,7 +32,7 @@ not supply them. # if defined (VXWORKS) # include /**/ <types/vxTypes.h> /* For wchar_t */ - typedef wchar_t wint_t; +# include <stddef.h> /* For wint_t */ typedef wchar_t wctype_t; # elif defined (__Lynx__) # include /**/ <stdlib.h> /* For wchar_t */ diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index c0fe9f9f473..5b0e2f9b49f 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -145,8 +145,11 @@ #define ACE_LACKS_ACCESS #define ACE_LACKS_EXEC #define ACE_LACKS_FCNTL +#define ACE_LACKS_FGETWC +#define ACE_LACKS_FGETWS #define ACE_LACKS_FILELOCKS #define ACE_LACKS_FORK +#define ACE_LACKS_FPUTWS #define ACE_LACKS_FSYNC #define ACE_LACKS_GETHOSTENT #define ACE_LACKS_GETSERVBYNAME |