diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-06-14 17:40:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-23 17:35:27 -0700 |
| commit | 0d21efa51cc7de5250d5da46bceacda78ba35373 (patch) | |
| tree | 7716a2c8723a3e5cf7d479654f47867d27451330 /xdiff/xmacros.h | |
| parent | cda8ab59bbdb24b4ef87083781dac1f4f1b973a1 (diff) | |
| download | git-0d21efa51cc7de5250d5da46bceacda78ba35373.tar.gz | |
Teach diff about -b and -w flags
This adds -b (--ignore-space-change) and -w (--ignore-all-space) flags to
diff. The main part of the patch is teaching libxdiff about it.
[jc: renamed xdl_line_match() to xdl_recmatch() since the former is used
for different purposes in xpatchi.c which is in the parts of the upstream
source we do not use.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff/xmacros.h')
| -rw-r--r-- | xdiff/xmacros.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h index 78f02603b8..4c2fde80c1 100644 --- a/xdiff/xmacros.h +++ b/xdiff/xmacros.h @@ -33,7 +33,6 @@ #define XDL_ISDIGIT(c) ((c) >= '0' && (c) <= '9') #define XDL_HASHLONG(v, b) (((unsigned long)(v) * GR_PRIME) >> ((CHAR_BIT * sizeof(unsigned long)) - (b))) #define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0) -#define XDL_RECMATCH(r1, r2) ((r1)->size == (r2)->size && memcmp((r1)->ptr, (r2)->ptr, (r1)->size) == 0) #define XDL_LE32_PUT(p, v) \ do { \ unsigned char *__p = (unsigned char *) (p); \ |