git/xdiff/xdiff.h

/*
 *  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, see
 *  <http://www.gnu.org/licenses/>.
 *
 *  Davide Libenzi <[email protected]>
 *
 */

#if !defined(XDIFF_H)
#define XDIFF_H

#ifdef __cplusplus
extern "C" {
#endif /* #ifdef __cplusplus */

/* xpparm_t.flags */
#define XDF_NEED_MINIMAL …

#define XDF_IGNORE_WHITESPACE …
#define XDF_IGNORE_WHITESPACE_CHANGE …
#define XDF_IGNORE_WHITESPACE_AT_EOL …
#define XDF_IGNORE_CR_AT_EOL …
#define XDF_WHITESPACE_FLAGS …

#define XDF_IGNORE_BLANK_LINES …

#define XDF_PATIENCE_DIFF …
#define XDF_HISTOGRAM_DIFF …
#define XDF_DIFF_ALGORITHM_MASK …
#define XDF_DIFF_ALG(x) …

#define XDF_INDENT_HEURISTIC …

/* xdemitconf_t.flags */
#define XDL_EMIT_FUNCNAMES …
#define XDL_EMIT_NO_HUNK_HDR …
#define XDL_EMIT_FUNCCONTEXT …

/* merge simplification levels */
#define XDL_MERGE_MINIMAL …
#define XDL_MERGE_EAGER …
#define XDL_MERGE_ZEALOUS …
#define XDL_MERGE_ZEALOUS_ALNUM …

/* merge favor modes */
#define XDL_MERGE_FAVOR_OURS …
#define XDL_MERGE_FAVOR_THEIRS …
#define XDL_MERGE_FAVOR_UNION …

/* merge output styles */
#define XDL_MERGE_DIFF3 …
#define XDL_MERGE_ZEALOUS_DIFF3 …

mmfile_t;

mmbuffer_t;

xpparam_t;

xdemitcb_t;

find_func_t;

xdl_emit_hunk_consume_func_t;

xdemitconf_t;

bdiffparam_t;


#define xdl_malloc(x) …
#define xdl_calloc(n, sz) …
#define xdl_free(ptr) …
#define xdl_realloc(ptr,x) …

void *xdl_mmfile_first(mmfile_t *mmf, long *size);
long xdl_mmfile_size(mmfile_t *mmf);

int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
	     xdemitconf_t const *xecfg, xdemitcb_t *ecb);

xmparam_t;

#define DEFAULT_CONFLICT_MARKER_SIZE …

int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
		xmparam_t const *xmp, mmbuffer_t *result);

#ifdef __cplusplus
}
#endif /* #ifdef __cplusplus */

#endif /* #if !defined(XDIFF_H) */