From 0f3def715dc9af442f5f025c50a041c6319df1e8 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 9 Nov 2012 11:19:46 -0800 Subject: 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. --- src/diff.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/diff.h') 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( -- cgit v1.2.1