X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=e9de2e4695fc0ab588c629ebce02e12ff94a15de;hb=3f732ec3f85c5db7c563eba5fcb24a7ce69ec79e;hp=da20dfe80c740cc06a113326cd780f6f83a00855;hpb=026148e2e90368c0b23192f506e15aa6197105aa;p=pdclib

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index da20dfe..e9de2e4 100644
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -162,7 +162,7 @@ typedef unsigned long      _PDCLIB_uint32_t;
 #endif
 
 /* Setting 'int64_t', its limits, its literal, and conversion macros.         */
-#if     _PDCLIB_LONG_BYTES == 8
+#if     _PDCLIB_LONG_BYTES == 8 && !defined(_PDCLIB_INT64_IS_LLONG)
 typedef signed long        _PDCLIB_int64_t;
 typedef unsigned long      _PDCLIB_uint64_t;
 #define _PDCLIB_INT64_MAX  _PDCLIB_LONG_MAX
@@ -231,7 +231,11 @@ typedef _PDCLIB_size     _PDCLIB_size_t;
 #define _PDCLIB_SIZE_MAX _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_SIZE ), _MAX )
 
 typedef _PDCLIB_wint      _PDCLIB_wint_t;
-typedef _PDCLIB_wchar     _PDCLIB_wchar_t;
+#ifndef __cplusplus
+    typedef _PDCLIB_wchar     _PDCLIB_wchar_t;
+#else
+    typedef wchar_t _PDCLIB_wchar_t;
+#endif
 #define _PDCLIB_WCHAR_MIN _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_WCHAR ), _MIN )
 #define _PDCLIB_WCHAR_MAX _PDCLIB_concat( _PDCLIB_concat( _PDCLIB_, _PDCLIB_WCHAR ), _MAX )
 
@@ -418,8 +422,8 @@ struct _PDCLIB_ctype_t
 /* mbstate_t                                                                  */
 /* -------------------------------------------------------------------------- */
 
-struct _PDCLIB_mbstate_t {
+typedef struct _PDCLIB_mbstate_t {
     _PDCLIB_uint32_t st[4];
-};
+} _PDCLIB_mbstate_t;
 
 #endif