Windows resource: handle dashes in the Git version gracefully
[git/dscho.git] / xdiff / xdiff.h
blob219a3bbca613192d8b127659e4bfc0d60f38cf10
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_IGNORE_WHITESPACE_AT_EOL (1 << 4)
35 #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
37 #define XDF_PATIENCE_DIFF (1 << 5)
38 #define XDF_HISTOGRAM_DIFF (1 << 6)
39 #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
40 #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
42 #define XDL_EMIT_FUNCNAMES (1 << 0)
43 #define XDL_EMIT_COMMON (1 << 1)
44 #define XDL_EMIT_FUNCCONTEXT (1 << 2)
46 #define XDL_MMB_READONLY (1 << 0)
48 #define XDL_MMF_ATOMIC (1 << 0)
50 #define XDL_BDOP_INS 1
51 #define XDL_BDOP_CPY 2
52 #define XDL_BDOP_INSB 3
54 /* merge simplification levels */
55 #define XDL_MERGE_MINIMAL 0
56 #define XDL_MERGE_EAGER 1
57 #define XDL_MERGE_ZEALOUS 2
58 #define XDL_MERGE_ZEALOUS_ALNUM 3
60 /* merge favor modes */
61 #define XDL_MERGE_FAVOR_OURS 1
62 #define XDL_MERGE_FAVOR_THEIRS 2
63 #define XDL_MERGE_FAVOR_UNION 3
65 /* merge output styles */
66 #define XDL_MERGE_DIFF3 1
68 typedef struct s_mmfile {
69 char *ptr;
70 long size;
71 } mmfile_t;
73 typedef struct s_mmbuffer {
74 char *ptr;
75 long size;
76 } mmbuffer_t;
78 typedef struct s_xpparam {
79 unsigned long flags;
80 } xpparam_t;
82 typedef struct s_xdemitcb {
83 void *priv;
84 int (*outf)(void *, mmbuffer_t *, int);
85 } xdemitcb_t;
87 typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
89 typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a,
90 long start_b, long count_b,
91 void *cb_data);
93 typedef struct s_xdemitconf {
94 long ctxlen;
95 long interhunkctxlen;
96 unsigned long flags;
97 find_func_t find_func;
98 void *find_func_priv;
99 xdl_emit_hunk_consume_func_t hunk_func;
100 } xdemitconf_t;
102 typedef struct s_bdiffparam {
103 long bsize;
104 } bdiffparam_t;
107 #define xdl_malloc(x) malloc(x)
108 #define xdl_free(ptr) free(ptr)
109 #define xdl_realloc(ptr,x) realloc(ptr,x)
111 void *xdl_mmfile_first(mmfile_t *mmf, long *size);
112 long xdl_mmfile_size(mmfile_t *mmf);
114 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
115 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
117 typedef struct s_xmparam {
118 xpparam_t xpp;
119 int marker_size;
120 int level;
121 int favor;
122 int style;
123 const char *ancestor; /* label for orig */
124 const char *file1; /* label for mf1 */
125 const char *file2; /* label for mf2 */
126 } xmparam_t;
128 #define DEFAULT_CONFLICT_MARKER_SIZE 7
130 int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
131 xmparam_t const *xmp, mmbuffer_t *result);
133 #ifdef __cplusplus
135 #endif /* #ifdef __cplusplus */
137 #endif /* #if !defined(XDIFF_H) */