Updade decl.h and fix requirements

libgit2 · Sep 6, 2018 · dfa536a · dfa536a
1 parent 9951316
commit dfa536a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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,