Changeset 99802 in vbox for trunk/include/iprt

Timestamp:

May 16, 2023 12:05:16 AM (19 months ago)

Author:

vboxsync

Message:

*: Adjustments necessary for dropping -Zc:wchar_t- on windows and instead let the C++ compiler use the native wchar_t type.

Location:

trunk/include/iprt

Files:

• nocrt/limits.h (modified) (1 diff)
• types.h (modified) (2 diffs)

trunk/include/iprt/nocrt/limits.h

@@ -54 +54 @@
 #endif
 
+#if !defined(WCHAR_MIN)
+# if defined(RT_OS_WINDOWS)
+#  define WCHAR_MIN     0
+# endif
+#endif
+#if !defined(WCHAR_MAX)
+# if defined(RT_OS_WINDOWS)
+#  define WCHAR_MAX     0xffff
+# endif
+#endif
+/** @todo Define WCHAR_MIN+WCHAR_MAX on non-windows */
+
 #define WORD_BIT        16
 #define USHRT_MAX       0xffff

trunk/include/iprt/types.h

@@ -3384 +3384 @@
 
 /**
- * UTF-16 character.
- * @remark  wchar_t is not usable since it's compiler defined.
+ * UTF-16 character. 
+ *  
+ * @remark  wchar_t is not usable since it's compiler defined and can be 8 thru 
+ *          64 bit wide.  On Windows it is 16-bit, though, and for various
+ *          reasons of convenience we need to use the native compiler type when
+ *          compling without the /Zc:wchar_t- option (only relevant for C++ and
+ *          _NATIVE_WCHAR_T_DEFINED indicates the absense of /Zc:wchar_t-).
+ *  
  * @remark  When we use the term character we're not talking about unicode code point, but
  *          the basic unit of the string encoding. Thus cwc - count of wide chars - means
@@ -3391 +3397 @@
  *          and cch means count of the typedef 'char', which is assumed to be an octet.
  */
+#if defined(_MSC_VER) && defined(__cplusplus) && defined(_NATIVE_WCHAR_T_DEFINED)
+typedef __wchar_t               RTUTF16;
+#else
 typedef uint16_t                RTUTF16;
+#endif
 /** Pointer to a UTF-16 character. */
 typedef RTUTF16         RT_FAR *PRTUTF16;