diff options
| author | Russell Belfer <rb@github.com> | 2012-11-09 11:19:46 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-11-09 13:52:07 -0800 |
| commit | 0f3def715dc9af442f5f025c50a041c6319df1e8 (patch) | |
| tree | e5a327bab384ab865471d019c83637b6ed167e3c /src/diff.h | |
| parent | 8064ecba2384df32d5b821398a346f0c96cf74d1 (diff) | |
| download | libgit2-0f3def715dc9af442f5f025c50a041c6319df1e8.tar.gz | |
Fix various cross-platform build issues
This fixes a number of warnings and problems with cross-platform
builds. Among other things, it's not safe to name a member of a
structure "strcmp" because that may be #defined.
Diffstat (limited to 'src/diff.h')
| -rw-r--r-- | src/diff.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/diff.h b/src/diff.h index e9d8fd5a7..1e3be7593 100644 --- a/src/diff.h +++ b/src/diff.h @@ -42,10 +42,10 @@ struct git_diff_list { git_iterator_type_t new_src; uint32_t diffcaps; - int (*strcmp)(const char *, const char *); - int (*strncmp)(const char *, const char *, size_t); - int (*prefixcmp)(const char *str, const char *pfx); - int (*entrycmp)(const void *a, const void *b); + int (*strcomp)(const char *, const char *); + int (*strncomp)(const char *, const char *, size_t); + int (*pfxcomp)(const char *str, const char *pfx); + int (*entrycomp)(const void *a, const void *b); }; extern void git_diff__cleanup_modes( |