Fix Unicode includes in NSString.m

Fixes compilation using ICU bundled with Windows.
This commit is contained in:
Frederik Seiffert 2024-05-14 09:34:20 +02:00 committed by Frederik Seiffert
parent 6e2bd5c4e8
commit 94a6cb9919
4 changed files with 19 additions and 13 deletions

View file

@ -66,11 +66,13 @@
#import "Foundation/NSLocale.h"
#import "Foundation/NSLock.h"
#import "Foundation/NSNotification.h"
#import "Foundation/NSObjCRuntime.h"
#import "Foundation/NSScanner.h"
#import "Foundation/NSUserDefaults.h"
#import "Foundation/FoundationErrors.h"
// For private method _decodePropertyListForKey:
#import "Foundation/NSKeyedArchiver.h"
#import "GNUstepBase/GSBlocks.h"
#import "GNUstepBase/GSMime.h"
#import "GNUstepBase/NSString+GNUstepBase.h"
#import "GNUstepBase/NSMutableString+GNUstepBase.h"
@ -102,24 +104,22 @@
#if defined(HAVE_UNICODE_UNORM2_H)
# include <unicode/unorm2.h>
#endif
#if defined(HAVE_UNICODE_USTRING_H)
#if defined(HAVE_UNICODE_USTRING_H)
# include <unicode/ustring.h>
#endif
#if defined(HAVE_UNICODE_USEARCH_H)
#if defined(HAVE_UNICODE_USEARCH_H)
# include <unicode/usearch.h>
#endif
#if defined(HAVE_ICU_H)
#if defined(HAVE_UNICODE_UBRK_H)
# include <unicode/ubrk.h>
#endif
#if defined(HAVE_UNICODE_UTYPES_H)
# include <unicode/utypes.h>
#endif
#if defined(HAVE_ICU_H)
# include <icu.h>
#endif
#import "Foundation/NSObjCRuntime.h"
#import "GNUstepBase/GSBlocks.h"
#if GS_USE_ICU
#include <unicode/ubrk.h>
#include <unicode/utypes.h>
#endif
/* Create local inline versions of key functions for case-insensitive operations
*/
#import "Additions/unicode/caseconv.h"