Separate out a git_merge_tree_flag_t type for MSVC

alexcrichton · Oct 7, 2015 · 74badb3 · 74badb3
1 parent 62da0bf
commit 74badb3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/libgit2-sys/lib.rs b/libgit2-sys/lib.rs
@@ -1069,14 +1069,17 @@ pub use git_diff_binary_t::*;
 #[repr(C)]
 pub struct git_merge_options {
     pub version: c_uint,
-    pub tree_flags: u32,
+    pub tree_flags: git_merge_tree_flag_t,
     pub rename_threshold: c_uint,
     pub target_limit: c_uint,
     pub metric: *mut git_diff_similarity_metric,
     pub file_favor: git_merge_file_favor_t,
     pub file_flags: c_uint,
 }
 
+pub type git_merge_tree_flag_t = u32;
+pub const GIT_MERGE_TREE_FIND_RENAMES: git_merge_tree_flag_t = 1 << 0;
+
 #[repr(C)]
 pub enum git_merge_file_favor_t {
     GIT_MERGE_FILE_FAVOR_NORMAL = 0,
@@ -1086,8 +1089,6 @@ pub enum git_merge_file_favor_t {
 }
 pub use git_merge_file_favor_t::*;
 
-pub const GIT_MERGE_TREE_FIND_RENAMES: u32 = 1 << 0;
-
 // used in git_merge_options.file_flags
 pub const GIT_MERGE_FILE_DEFAULT: u32 = 0;
 pub const GIT_MERGE_FILE_STYLE_MERGE: u32 = (1 << 0);