diff options
| author | Russell Belfer <rb@github.com> | 2013-10-03 01:13:11 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-10-03 21:45:04 +0400 |
| commit | af302acaee95ff2ca3379b93cd886ebe96adff10 (patch) | |
| tree | 83be2a9f600c43a5b6c1aba17239bab56e83d934 /src/repository.c | |
| parent | 618b7689e1cdd4ebd956949a95038fd49592a187 (diff) | |
Clean up annoying warnings
The indexer code was generating warnings on Windows 64-bit. I
looked closely at the logic and was able to simplify it a bit.
Also this fixes some other Windows and Linux warnings.
Diffstat (limited to 'src/repository.c')
| -rw-r--r-- | src/repository.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/repository.c b/src/repository.c index 64f13978d..51cc76db4 100644 --- a/src/repository.c +++ b/src/repository.c @@ -890,6 +890,8 @@ static bool are_symlinks_supported(const char *wd_path) return symlinks_supported; } +#ifdef GIT_USE_ICONV + static const char *nfc_file = "\xC3\x85\x73\x74\x72\xC3\xB6\x6D.XXXXXX"; static const char *nfd_file = "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D.XXXXXX"; @@ -938,6 +940,8 @@ fail: return need_precompose; } +#endif + static int create_empty_file(const char *path, mode_t mode) { int fd; @@ -994,7 +998,7 @@ static int repo_init_config( SET_REPO_CONFIG( bool, "core.filemode", is_chmod_supported(git_buf_cstr(&cfg_path))); -#if __APPLE__ +#ifdef GIT_USE_ICONV SET_REPO_CONFIG( bool, "core.precomposeunicode", should_precompose_unicode_paths(is_bare ? repo_dir : work_dir)); |