From dfa536a3d03a698cc01d9de0e9cf68de7a3b273d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
Date: Thu, 6 Sep 2018 20:21:12 +0200
Subject: [PATCH] Updade decl.h and fix requirements

---
 pygit2/decl.h | 1 +
 setup.py      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pygit2/decl.h b/pygit2/decl.h
index 534515839..87f58997f 100644
--- a/pygit2/decl.h
+++ b/pygit2/decl.h
@@ -836,6 +836,7 @@ typedef struct {
 	const char *their_label;
 	git_merge_file_favor_t favor;
 	git_merge_file_flag_t flags;
+	unsigned short marker_size;
 } git_merge_file_options;
 
 #define GIT_MERGE_OPTIONS_VERSION ...
diff --git a/setup.py b/setup.py
index 21d9276e1..d1fc4e903 100644
--- a/setup.py
+++ b/setup.py
@@ -195,7 +195,7 @@ def run(self):
       long_description=long_description,
       packages=['pygit2'],
       package_data={'pygit2': ['decl.h']},
-      setup_requires=['cffi'],
+      setup_requires=['cffi', 'pycparser<2.18'],
       install_requires=['cffi', 'six'],
       zip_safe=False,
       cmdclass=cmdclass,