diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-19 15:36:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-19 15:36:55 -0800 |
| commit | 307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (patch) | |
| tree | f12359319e8af782f8c2f31ca811643ec38213f0 /xdiff/xdiff.h | |
| parent | e5b06629de847663aaf0f7daae8de81338da3901 (diff) | |
| download | git-307ab20b333d9b4c818b1ff912e86944d1a3fdc1.tar.gz git-307ab20b333d9b4c818b1ff912e86944d1a3fdc1.tar.xz | |
xdiff: PATIENCE/HISTOGRAM are not independent option bits
Because the default Myers, patience and histogram algorithms cannot be in
effect at the same time, XDL_PATIENCE_DIFF and XDL_HISTOGRAM_DIFF are not
independent bits. Instead of wasting one bit per algorithm, define a few
macros to access the few bits they occupy and update the code that access
them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 70c8b87ff..09215afe6 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -32,9 +32,12 @@ extern "C" { #define XDF_IGNORE_WHITESPACE (1 << 2) #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3) #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4) +#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) + #define XDF_PATIENCE_DIFF (1 << 5) #define XDF_HISTOGRAM_DIFF (1 << 6) -#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) +#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF) +#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK) #define XDL_EMIT_FUNCNAMES (1 << 0) #define XDL_EMIT_COMMON (1 << 1) |