Skip to content

Commit 615b361

Browse files
committed
no need to include wchar.h in all cases
(cherry picked from commit a32d1af)
1 parent 4c2bb90 commit 615b361

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/headers/tomcrypt_pk.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -667,16 +667,16 @@ int der_printable_value_decode(int v);
667667

668668
/* UTF-8 */
669669
#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)
670-
#include <wchar.h>
671-
#if defined(__WCHAR_MAX__)
672-
#define LTC_WCHAR_MAX __WCHAR_MAX__
673-
#elif defined(WCHAR_MAX)
674-
#define LTC_WCHAR_MAX WCHAR_MAX
675-
#endif
670+
#if defined(__WCHAR_MAX__)
671+
#define LTC_WCHAR_MAX __WCHAR_MAX__
672+
#else
673+
#include <wchar.h>
674+
#define LTC_WCHAR_MAX WCHAR_MAX
675+
#endif
676676
/* please note that it might happen that LTC_WCHAR_MAX is undefined */
677677
#else
678-
typedef ulong32 wchar_t;
679-
#define LTC_WCHAR_MAX 0xFFFFFFFF
678+
typedef ulong32 wchar_t;
679+
#define LTC_WCHAR_MAX 0xFFFFFFFF
680680
#endif
681681

682682
int der_encode_utf8_string(const wchar_t *in, unsigned long inlen,

0 commit comments

Comments
 (0)