Skip to content

Commit 151a156

Browse files
include harmony macro check with strncasecmp and strcasecmp
1 parent 25dc3f0 commit 151a156

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

wolfssl/wolfcrypt/types.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -767,11 +767,13 @@ typedef struct w64wrapper {
767767
#endif
768768

769769
#ifndef XSTRCASECMP
770-
#if defined(MICROCHIP_PIC32) && (__XC32_VERSION >= 1000) && (__XC32_VERSION < 4000)
770+
#if (defined(MICROCHIP_MPLAB_HARMONY) || defined(MICROCHIP_PIC32)) && \
771+
(__XC32_VERSION >= 1000) && (__XC32_VERSION < 4000)
771772
/* XC32 supports str[n]casecmp in version >= 1.0 through 4.0. */
772773
#define XSTRCASECMP(s1,s2) strcasecmp((s1),(s2))
773-
#elif defined(MICROCHIP_PIC32) || defined(WOLFSSL_TIRTOS) || \
774-
defined(WOLFSSL_ZEPHYR) || defined(MICROCHIP_PIC24)
774+
#elif defined(MICROCHIP_MPLAB_HARMONY) || defined(MICROCHIP_PIC32) || \
775+
defined(WOLFSSL_TIRTOS) || defined(WOLFSSL_ZEPHYR) || \
776+
defined(MICROCHIP_PIC24)
775777
/* XC32 version < 1.0 does not support strcasecmp. */
776778
#define USE_WOLF_STRCASECMP
777779
#elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM)
@@ -799,11 +801,13 @@ typedef struct w64wrapper {
799801
#endif /* !XSTRCASECMP */
800802

801803
#ifndef XSTRNCASECMP
802-
#if defined(MICROCHIP_PIC32) && (__XC32_VERSION >= 1000)
804+
#if (defined(MICROCHIP_MPLAB_HARMONY) || defined(MICROCHIP_PIC32)) && \
805+
(__XC32_VERSION >= 1000)
803806
/* XC32 supports str[n]casecmp in version >= 1.0. */
804807
#define XSTRNCASECMP(s1,s2,n) strncasecmp((s1),(s2),(n))
805-
#elif defined(MICROCHIP_PIC32) || defined(WOLFSSL_TIRTOS) || \
806-
defined(WOLFSSL_ZEPHYR) || defined(MICROCHIP_PIC24)
808+
#elif defined(MICROCHIP_MPLAB_HARMONY) || defined(MICROCHIP_PIC32) || \
809+
defined(WOLFSSL_TIRTOS) || defined(WOLFSSL_ZEPHYR) || \
810+
defined(MICROCHIP_PIC24)
807811
/* XC32 version < 1.0 does not support strncasecmp. */
808812
#define USE_WOLF_STRNCASECMP
809813
#elif defined(USE_WINDOWS_API) || defined(FREERTOS_TCP_WINSIM)

0 commit comments

Comments
 (0)