From 16b83019af63d837b6934bcf1b71b8697d5d94c8 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Sun, 4 Mar 2012 23:28:36 -0800 Subject: Fix usage of "new" for fieldname in public header This should restore the ability to include libgit2 headers in C++ projects. Cherry picked 2de60205dfea2c4a422b2108a5e8605f97c2e895 from development into new-error-handling. --- src/diff.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/diff.h') diff --git a/src/diff.h b/src/diff.h index 6c432c894..ac2457956 100644 --- a/src/diff.h +++ b/src/diff.h @@ -14,8 +14,8 @@ #include "repository.h" #include "pool.h" -#define DIFF_SRC_PREFIX_DEFAULT "a/" -#define DIFF_DST_PREFIX_DEFAULT "b/" +#define DIFF_OLD_PREFIX_DEFAULT "a/" +#define DIFF_NEW_PREFIX_DEFAULT "b/" enum { GIT_DIFFCAPS_HAS_SYMLINKS = (1 << 0), /* symlinks on platform? */ -- cgit v1.2.1