diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2017-02-11 08:13:03 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2017-02-11 08:13:12 +0000 |
| commit | 4481526d08e7e436cabc01bfa852e873fd2d2b44 (patch) | |
| tree | bfcca423d3827a53cc5d7ab9abeddd383a9644dc | |
| parent | 3903fd9492d176c55e9539f797723a5cd6f29e2f (diff) | |
| download | enchant-4481526d08e7e436cabc01bfa852e873fd2d2b44.tar.gz | |
Remove unnecessary macOS ifdef: providers are linked against enchant on macOS
| -rw-r--r-- | src/ispell/ispell_checker.cpp | 20 | ||||
| -rw-r--r-- | src/myspell/myspell_checker.cpp | 8 | ||||
| -rw-r--r-- | src/uspell/uspell_provider.cpp | 13 |
3 files changed, 3 insertions, 38 deletions
diff --git a/src/ispell/ispell_checker.cpp b/src/ispell/ispell_checker.cpp index 6b86537..38b144f 100644 --- a/src/ispell/ispell_checker.cpp +++ b/src/ispell/ispell_checker.cpp @@ -292,32 +292,14 @@ ispell_checker_get_dictionary_dirs (EnchantBroker * broker) g_slist_free (config_dirs); } -#if 0 - { - const gchar* const * system_data_dirs = g_get_system_data_dirs (); - const gchar* const * iter; - - for (iter = system_data_dirs; *iter; iter++) - { - dirs = g_slist_append (dirs, g_build_filename (*iter, "ispell", "dicts", NULL)); - } - } -#endif - - /* until I work out how to link the modules against enchant in MacOSX - fjf - */ -#ifndef XP_TARGET_COCOA - char * ispell_prefix = NULL; - /* Dynamically locate library and search for modules relative to it. */ char * enchant_prefix = enchant_get_prefix_dir(); if(enchant_prefix) { - ispell_prefix = g_build_filename(enchant_prefix, "share", "enchant", "ispell", NULL); + char * ispell_prefix = g_build_filename(enchant_prefix, "share", "enchant", "ispell", NULL); g_free(enchant_prefix); dirs = g_slist_append (dirs, ispell_prefix); } -#endif #ifdef ENCHANT_ISPELL_DICT_DIR dirs = g_slist_append (dirs, g_strdup (ENCHANT_ISPELL_DICT_DIR)); diff --git a/src/myspell/myspell_checker.cpp b/src/myspell/myspell_checker.cpp index f105341..df9683e 100644 --- a/src/myspell/myspell_checker.cpp +++ b/src/myspell/myspell_checker.cpp @@ -198,20 +198,14 @@ myspell_checker_get_dictionary_dirs (EnchantBroker * broker) } } - /* until I work out how to link the modules against enchant in MacOSX - fjf - */ -#ifndef XP_TARGET_COCOA - char * myspell_prefix = NULL; - /* Dynamically locate library and search for modules relative to it. */ char * enchant_prefix = enchant_get_prefix_dir(); if(enchant_prefix) { - myspell_prefix = g_build_filename(enchant_prefix, "share", "enchant", "myspell", NULL); + char * myspell_prefix = g_build_filename(enchant_prefix, "share", "enchant", "myspell", NULL); g_free(enchant_prefix); dirs = g_slist_append (dirs, myspell_prefix); } -#endif #ifdef ENCHANT_MYSPELL_DICT_DIR dirs = g_slist_append (dirs, g_strdup (ENCHANT_MYSPELL_DICT_DIR)); diff --git a/src/uspell/uspell_provider.cpp b/src/uspell/uspell_provider.cpp index 0b3cf80..eefbdb5 100644 --- a/src/uspell/uspell_provider.cpp +++ b/src/uspell/uspell_provider.cpp @@ -80,25 +80,14 @@ uspell_checker_get_dictionary_dirs (EnchantBroker * broker) } } - /* until I work out how to link the modules against enchant in MacOSX - fjf - */ -#ifndef XP_TARGET_COCOA - char * uspell_prefix = NULL; - - /* Look for explicitly set registry values */ - uspell_prefix = enchant_get_registry_value ("Uspell", "Data_Dir"); - if (uspell_prefix) - dirs = g_slist_append (dirs, uspell_prefix); - /* Dynamically locate library and search for modules relative to it. */ char * enchant_prefix = enchant_get_prefix_dir(); if(enchant_prefix) { - uspell_prefix = g_build_filename(enchant_prefix, "share", "enchant", "uspell", NULL); + char * uspell_prefix = g_build_filename(enchant_prefix, "share", "enchant", "uspell", NULL); g_free(enchant_prefix); dirs = g_slist_append (dirs, uspell_prefix); } -#endif #ifdef ENCHANT_USPELL_DICT_DIR dirs = g_slist_append (dirs, g_strdup (ENCHANT_USPELL_DICT_DIR)); |