Add builtin merge-file, a minimal replacement for RCS merge
[git/jrn.git] / xdiff / xdiff.h
blobfa409d5234009bf6ddac8803e8d20ed1b23a3258
1 /*
2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003 Davide Libenzi
5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
15 * You should have received a copy of the GNU Lesser General Public
16 * License along with this library; if not, write to the Free Software
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 * Davide Libenzi <davidel@xmailserver.org>
23 #if !defined(XDIFF_H)
24 #define XDIFF_H
26 #ifdef __cplusplus
27 extern "C" {
28 #endif /* #ifdef __cplusplus */
31 #define XDF_NEED_MINIMAL (1 << 1)
32 #define XDF_IGNORE_WHITESPACE (1 << 2)
33 #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
34 #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE)
36 #define XDL_PATCH_NORMAL '-'
37 #define XDL_PATCH_REVERSE '+'
38 #define XDL_PATCH_MODEMASK ((1 << 8) - 1)
39 #define XDL_PATCH_IGNOREBSPACE (1 << 8)
41 #define XDL_EMIT_FUNCNAMES (1 << 0)
42 #define XDL_EMIT_COMMON (1 << 1)
44 #define XDL_MMB_READONLY (1 << 0)
46 #define XDL_MMF_ATOMIC (1 << 0)
48 #define XDL_BDOP_INS 1
49 #define XDL_BDOP_CPY 2
50 #define XDL_BDOP_INSB 3
52 #define XDL_MERGE_MINIMAL 0
53 #define XDL_MERGE_EAGER 1
54 #define XDL_MERGE_ZEALOUS 2
56 typedef struct s_mmfile {
57 char *ptr;
58 long size;
59 } mmfile_t;
61 typedef struct s_mmbuffer {
62 char *ptr;
63 long size;
64 } mmbuffer_t;
66 typedef struct s_xpparam {
67 unsigned long flags;
68 } xpparam_t;
70 typedef struct s_xdemitcb {
71 void *priv;
72 int (*outf)(void *, mmbuffer_t *, int);
73 } xdemitcb_t;
75 typedef struct s_xdemitconf {
76 long ctxlen;
77 unsigned long flags;
78 } xdemitconf_t;
80 typedef struct s_bdiffparam {
81 long bsize;
82 } bdiffparam_t;
85 #define xdl_malloc(x) malloc(x)
86 #define xdl_free(ptr) free(ptr)
87 #define xdl_realloc(ptr,x) realloc(ptr,x)
89 void *xdl_mmfile_first(mmfile_t *mmf, long *size);
90 void *xdl_mmfile_next(mmfile_t *mmf, long *size);
91 long xdl_mmfile_size(mmfile_t *mmf);
93 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
94 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
96 int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
97 mmfile_t *mf2, const char *name2,
98 xpparam_t const *xpp, int level, mmbuffer_t *result);
100 #ifdef __cplusplus
102 #endif /* #ifdef __cplusplus */
104 #endif /* #if !defined(XDIFF_H) */