mirror of
https://github.com/git/git.git
synced 2024-11-16 22:14:53 +01:00
0d21efa51c
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>
53 lines
1.8 KiB
C
53 lines
1.8 KiB
C
/*
|
|
* LibXDiff by Davide Libenzi ( File Differential Library )
|
|
* Copyright (C) 2003 Davide Libenzi
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* Davide Libenzi <davidel@xmailserver.org>
|
|
*
|
|
*/
|
|
|
|
#if !defined(XMACROS_H)
|
|
#define XMACROS_H
|
|
|
|
|
|
#define GR_PRIME 0x9e370001UL
|
|
|
|
|
|
#define XDL_MIN(a, b) ((a) < (b) ? (a): (b))
|
|
#define XDL_MAX(a, b) ((a) > (b) ? (a): (b))
|
|
#define XDL_ABS(v) ((v) >= 0 ? (v): -(v))
|
|
#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_LE32_PUT(p, v) \
|
|
do { \
|
|
unsigned char *__p = (unsigned char *) (p); \
|
|
*__p++ = (unsigned char) (v); \
|
|
*__p++ = (unsigned char) ((v) >> 8); \
|
|
*__p++ = (unsigned char) ((v) >> 16); \
|
|
*__p = (unsigned char) ((v) >> 24); \
|
|
} while (0)
|
|
#define XDL_LE32_GET(p, v) \
|
|
do { \
|
|
unsigned char const *__p = (unsigned char const *) (p); \
|
|
(v) = (unsigned long) __p[0] | ((unsigned long) __p[1]) << 8 | \
|
|
((unsigned long) __p[2]) << 16 | ((unsigned long) __p[3]) << 24; \
|
|
} while (0)
|
|
|
|
|
|
#endif /* #if !defined(XMACROS_H) */
|
|
|