Merge branch 'master' into pb/gitpm

[git.git] / xdiff / xdiff.h

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 71cb9391af84a6b9640e25c80c8706b3b58e377e..c9f817818a781164b63c78be2af71a5d21e35d6f 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -29,12 +29,18 @@ extern "C" {
 
 
 #define XDF_NEED_MINIMAL (1 << 1)
+#define XDF_IGNORE_WHITESPACE (1 << 2)
+#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
+#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE)
 
 #define XDL_PATCH_NORMAL '-'
 #define XDL_PATCH_REVERSE '+'
 #define XDL_PATCH_MODEMASK ((1 << 8) - 1)
 #define XDL_PATCH_IGNOREBSPACE (1 << 8)
 
+#define XDL_EMIT_FUNCNAMES (1 << 0)
+#define XDL_EMIT_COMMON (1 << 1)
+
 #define XDL_MMB_READONLY (1 << 0)
 
 #define XDL_MMF_ATOMIC (1 << 0)
@@ -65,6 +71,7 @@ typedef struct s_xdemitcb {
 
 typedef struct s_xdemitconf {
        long ctxlen;
+       unsigned long flags;
 } xdemitconf_t;
 
 typedef struct s_bdiffparam {