@@ -649,13 +649,13 @@ int _pathname_foldcase_icu(const UChar *src, UChar **dest)
649649}
650650
651651/**
652- * ICU5x/USE_UNORM2 handle: gets a reference to a singleton unorm2 object (USE_UNORM2 ) or to a constant
652+ * ICU5x/ICU6x handle: gets a reference to a singleton unorm2 object (ICU6x ) or to a constant
653653 * value that we can use to differentiate between NFC and NFD modes (ICU5x). Neither should be
654654 * freed after use.
655655 */
656656static inline void * _unorm_handle (bool nfc , UErrorCode * err )
657657{
658- #ifdef USE_UNORM2
658+ #ifdef ICU6x
659659 * err = U_ZERO_ERROR ;
660660 return (void * ) unorm2_getInstance (NULL , "nfc" , nfc ? UNORM2_COMPOSE : UNORM2_DECOMPOSE , err );
661661#else
@@ -666,7 +666,7 @@ static inline void *_unorm_handle(bool nfc, UErrorCode *err)
666666static inline UNormalizationCheckResult _unorm_quickCheck (void * handle , const UChar * src , UChar * * dest , UErrorCode * err )
667667{
668668 * err = U_ZERO_ERROR ;
669- #ifdef USE_UNORM2
669+ #ifdef ICU6x
670670 const UNormalizer2 * n2 = (const UNormalizer2 * ) handle ;
671671 return unorm2_quickCheck (n2 , src , -1 , err );
672672#else
@@ -678,7 +678,7 @@ static inline UNormalizationCheckResult _unorm_quickCheck(void *handle, const UC
678678static inline int32_t _unorm_normalize (void * handle , const UChar * src , UChar * * dest , int32_t len , UErrorCode * err )
679679{
680680 * err = U_ZERO_ERROR ;
681- #ifdef USE_UNORM2
681+ #ifdef ICU6x
682682 const UNormalizer2 * n2 = (const UNormalizer2 * ) handle ;
683683 return unorm2_normalize (n2 , src , -1 , dest ? * dest : NULL , len , err );
684684#else
0 commit comments