diff options
Diffstat (limited to 'ace/OS_NS_wchar.h')
| -rw-r--r-- | ace/OS_NS_wchar.h | 103 |
1 files changed, 48 insertions, 55 deletions
diff --git a/ace/OS_NS_wchar.h b/ace/OS_NS_wchar.h index 55999db6e59..73db3b1c6ef 100644 --- a/ace/OS_NS_wchar.h +++ b/ace/OS_NS_wchar.h @@ -14,8 +14,8 @@ */ //============================================================================= -#ifndef ACE_OS_NS_WCHAR_H -# define ACE_OS_NS_WCHAR_H +#ifndef ACE_OS_NS_wchar_t_H +# define ACE_OS_NS_wchar_t_H # include /**/ "ace/pre.h" @@ -25,10 +25,9 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/os_wchar.h" +#include "ace/ace_wchar.h" #include "ace/Basic_Types.h" #include "ace/ACE_export.h" -#include "ace/ace_wchar.h" // include for the time being, but this code needs to be moved. dhinton #include "ace/os_include/os_errno.h" @@ -42,100 +41,96 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - typedef ACE_WCHAR_T WChar; - -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wint_t fgetwc (FILE* fp); -#endif /* ACE_HAS_WCHAR */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCAT) +#if defined (ACE_LACKS_WCSCAT) /// Emulated wcscat - Appends a string. extern ACE_Export wchar_t *wcscat_emulation (wchar_t *destination, const wchar_t *source); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCAT */ +#endif /* ACE_LACKS_WCSCAT */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCHR) +#if defined (ACE_LACKS_WCSCHR) /// Emulated wcschr - Finds a character in a string. extern ACE_Export wchar_t *wcschr_emulation (const wchar_t *string, wint_t c); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCHR */ +#endif /* ACE_LACKS_WCSCHR */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSCMP) +#if defined (ACE_LACKS_WCSCMP) /// Emulated wcscmp - Compares strings. extern ACE_Export - int wcscmp_emulation (const ACE_WCHAR_T *string1, const ACE_WCHAR_T *string2); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */ + int wcscmp_emulation (const wchar_t *string1, const wchar_t *string2); +#endif /* ACE_LACKS_WCSCMP */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCPY) +#if defined (ACE_LACKS_WCSCPY) /// Emulated wcscpy - Copies a string. extern ACE_Export wchar_t *wcscpy_emulation (wchar_t *destination, const wchar_t *source); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCPY */ +#endif /* ACE_LACKS_WCSCPY */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCSPN) +#if defined (ACE_LACKS_WCSCSPN) /// Emulated wcscspn. extern ACE_Export size_t wcscspn_emulation (const wchar_t *string, const wchar_t *reject); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCSPN */ +#endif /* ACE_LACKS_WCSCSPN */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSICMP) +#if defined (ACE_LACKS_WCSICMP) /// Emulated wcsicmp - Performs a case insensitive comparison of strings. extern ACE_Export int wcsicmp_emulation (const wchar_t *string1, const wchar_t *string2); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSICMP */ +#endif /* ACE_LACKS_WCSICMP */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSLEN) +#if defined (ACE_LACKS_WCSLEN) /// Emulated wcslen - Returns the length of a string. extern ACE_Export - size_t wcslen_emulation (const ACE_WCHAR_T *string); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */ + size_t wcslen_emulation (const wchar_t *string); +#endif /* ACE_LACKS_WCSLEN */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT) +#if defined (ACE_LACKS_WCSNCAT) /// Emulated wcscat - Appends a string. extern ACE_Export - ACE_WCHAR_T *wcsncat_emulation (ACE_WCHAR_T *destination, - const ACE_WCHAR_T *source, + wchar_t *wcsncat_emulation (wchar_t *destination, + const wchar_t *source, size_t count); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCAT */ +#endif /* ACE_LACKS_WCSCAT */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCMP) +#if defined (ACE_LACKS_WCSNCMP) /// Emulated wcsncmp - Compares two arrays. extern ACE_Export - int wcsncmp_emulation (const ACE_WCHAR_T *string1, - const ACE_WCHAR_T *string2, + int wcsncmp_emulation (const wchar_t *string1, + const wchar_t *string2, size_t len); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */ +#endif /* ACE_LACKS_WCSNCMP */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCPY) +#if defined (ACE_LACKS_WCSNCPY) /// Emulated wcsncpy - Copies an array. extern ACE_Export - ACE_WCHAR_T *wcsncpy_emulation (ACE_WCHAR_T *destination, - const ACE_WCHAR_T *source, + wchar_t *wcsncpy_emulation (wchar_t *destination, + const wchar_t *source, size_t len); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */ +#endif /* ACE_LACKS_WCSNCPY */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSNICMP) +#if defined (ACE_LACKS_WCSNICMP) /// Emulated wcsnicmp - Performs a case insensitive comparison of two /// arrays extern ACE_Export int wcsnicmp_emulation (const wchar_t *string1, const wchar_t *string2, size_t len); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNICMP */ +#endif /* ACE_LACKS_WCSNICMP */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSPBRK) +#if defined (ACE_LACKS_WCSPBRK) /// Emulated wcspbrk - Searches for characters in a string. extern ACE_Export wchar_t *wcspbrk_emulation (const wchar_t *string, const wchar_t *charset); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSPBRK */ +#endif /* ACE_LACKS_WCSPBRK */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSRCHR) +#if defined (ACE_LACKS_WCSRCHR) /// Emulated wcsrchr (wchar_t version) - Finds the last occurance of a /// character in a string. extern ACE_Export @@ -145,43 +140,41 @@ namespace ACE_OS /// character in a string. extern ACE_Export const wchar_t *wcsrchr_emulation (const wchar_t *string, wint_t c); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSRCHR */ +#endif /* ACE_LACKS_WCSRCHR */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSPN) +#if defined (ACE_LACKS_WCSSPN) /// Emulated wcsspn. extern ACE_Export size_t wcsspn_emulation (const wchar_t *string, const wchar_t *charset); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSPN */ +#endif /* ACE_LACKS_WCSSPN */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSTR) +#if defined (ACE_LACKS_WCSSTR) /// Emulated wcsstr - Performs a case insensitive comparison of two strings. extern ACE_Export wchar_t *wcsstr_emulation (const wchar_t *string, const wchar_t *charset); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSTR */ +#endif /* ACE_LACKS_WCSSTR */ // these are named wrong. should be wcslen, etc... dhinton ACE_NAMESPACE_INLINE_FUNCTION - u_int wslen (const WChar *); + u_int wslen (const wchar_t *); ACE_NAMESPACE_INLINE_FUNCTION - WChar *wscpy (WChar *, - const WChar *); + wchar_t *wscpy (wchar_t *, + const wchar_t *); ACE_NAMESPACE_INLINE_FUNCTION - int wscmp (const WChar *, - const WChar *); + int wscmp (const wchar_t *, + const wchar_t *); ACE_NAMESPACE_INLINE_FUNCTION - int wsncmp (const WChar *, - const WChar *, + int wsncmp (const wchar_t *, + const wchar_t *, size_t len); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wint_t ungetwc (wint_t c, FILE* fp); -#endif /* ACE_HAS_WCHAR */ } /* namespace ACE_OS */ |