From 519757279eb25fe4075f65b86da5ce52d352b454 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Thu, 7 Jun 2012 23:13:39 +0100
Subject: [PATCH] Fix double-defines when using GIT_OLD_ERRORS

---
 include/git2/errors.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/git2/errors.h b/include/git2/errors.h
index ccbc9fcf4..b4809fe15 100644
--- a/include/git2/errors.h
+++ b/include/git2/errors.h
@@ -20,6 +20,7 @@ GIT_BEGIN_DECL
 #ifdef GIT_OLD_ERRORS
 enum {
 	GIT_SUCCESS = 0,
+	GIT_ERROR = -1,
 	GIT_ENOTOID = -2,
 	GIT_ENOTFOUND = -3,
 	GIT_ENOMEM = -4,
@@ -52,7 +53,7 @@ enum {
 	GIT_ENOMATCH = -31,
 	GIT_ESHORTBUFFER = -32,
 };
-#endif
+#else
 
 /** Generic return codes */
 enum {
@@ -66,6 +67,7 @@ enum {
 	GIT_PASSTHROUGH = -30,
 	GIT_REVWALKOVER = -31,
 };
+#endif
 
 typedef struct {
 	char *message;