diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2020-06-10 23:16:13 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2020-06-10 23:16:13 +0800 |
| commit | 4b305c5721f68e39320ca2e15b03a411da2305f1 (patch) | |
| tree | 5b1698939cf893223f14cec77ed446f28a7d921a /libtomcrypt/src/headers/tomcrypt_pk.h | |
| parent | 615885be01188e433cf931e2f7f85394fdc31c5d (diff) | |
Merge libtomcrypt v1.18.2
Diffstat (limited to 'libtomcrypt/src/headers/tomcrypt_pk.h')
| -rw-r--r-- | libtomcrypt/src/headers/tomcrypt_pk.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libtomcrypt/src/headers/tomcrypt_pk.h b/libtomcrypt/src/headers/tomcrypt_pk.h index 4ea6f88..fb9b07c 100644 --- a/libtomcrypt/src/headers/tomcrypt_pk.h +++ b/libtomcrypt/src/headers/tomcrypt_pk.h @@ -667,16 +667,16 @@ int der_printable_value_decode(int v); /* UTF-8 */ #if (defined(SIZE_MAX) || __STDC_VERSION__ >= 199901L || defined(WCHAR_MAX) || defined(__WCHAR_MAX__) || defined(_WCHAR_T) || defined(_WCHAR_T_DEFINED) || defined (__WCHAR_TYPE__)) && !defined(LTC_NO_WCHAR) -#include <wchar.h> -#if defined(__WCHAR_MAX__) -#define LTC_WCHAR_MAX __WCHAR_MAX__ -#elif defined(WCHAR_MAX) -#define LTC_WCHAR_MAX WCHAR_MAX -#endif + #if defined(__WCHAR_MAX__) + #define LTC_WCHAR_MAX __WCHAR_MAX__ + #else + #include <wchar.h> + #define LTC_WCHAR_MAX WCHAR_MAX + #endif /* please note that it might happen that LTC_WCHAR_MAX is undefined */ #else -typedef ulong32 wchar_t; -#define LTC_WCHAR_MAX 0xFFFFFFFF + typedef ulong32 wchar_t; + #define LTC_WCHAR_MAX 0xFFFFFFFF #endif int der_encode_utf8_string(const wchar_t *in, unsigned long inlen, |