ntdll: Delay NFC table loading on macOS.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48689Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Delay NFC table loading on macOS.
35c22385 · Alexandre Julliard · 76606eae · 35c22385
Commit 35c22385 authored Mar 03, 2020 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

locale.c dlls/ntdll/locale.c +5 -7

No files found.
--- a/dlls/ntdll/locale.c
+++ b/dlls/ntdll/locale.c
@@ -799,13 +799,7 @@ void init_unix_codepage(void)

 #else  /* __APPLE__ || __ANDROID__ */

-void init_unix_codepage(void)
-{
-#ifdef __APPLE__
-    const struct norm_table *info;
-    load_norm_table( NormalizationC, &info );
-#endif
-}
+void init_unix_codepage(void) { }

 #endif  /* __APPLE__ || __ANDROID__ */

@@ -909,6 +903,10 @@ void init_locale( HMODULE module )
    user_lcid = unix_locale_to_lcid( setlocale( LC_MESSAGES, NULL ));

 #ifdef __APPLE__
+    {
+        const struct norm_table *info;
+        load_norm_table( NormalizationC, &info );
+    }
    if (!system_lcid)
    {
        char buffer[LOCALE_NAME_MAX_LENGTH];