diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2010-07-23 21:46:06 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2010-07-23 21:46:06 +0000 |
| commit | e8df46ebc95c21d2fa189e326823cccada62e7cc (patch) | |
| tree | 48c7fb4aadada0cc104af21571a8b98cda5a6187 /usr.bin/cvs/diff.h | |
| parent | 4f1a72500c438538bed55293f2e724efc28584f0 (diff) | |
Reduce variable/function name and whitespace differences between
cvs/rcs.
OK xsa zinovik
Diffstat (limited to 'usr.bin/cvs/diff.h')
| -rw-r--r-- | usr.bin/cvs/diff.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 757b272b391..16934ca551d 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.20 2009/06/07 08:39:13 ray Exp $ */ +/* $OpenBSD: diff.h,v 1.21 2010/07/23 21:46:05 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -63,8 +63,8 @@ * * @(#)diffreg.c 8.1 (Berkeley) 6/6/93 */ -#ifndef CVS_DIFF_H -#define CVS_DIFF_H +#ifndef DIFF_H +#define DIFF_H #define CVS_DIFF_DEFCTX 3 /* default context length */ /* @@ -80,13 +80,13 @@ /* * Command line flags */ -#define D_FORCEASCII 0x01 /* Treat file as ascii regardless of content */ -#define D_FOLDBLANKS 0x02 /* Treat all white space as equal */ -#define D_MINIMAL 0x04 /* Make diff as small as possible */ -#define D_IGNORECASE 0x08 /* Case-insensitive matching */ -#define D_PROTOTYPE 0x10 /* Display C function prototype */ -#define D_EXPANDTABS 0x20 /* Expand tabs to spaces */ -#define D_IGNOREBLANKS 0x40 /* Ignore white space changes */ +#define D_FORCEASCII 0x01 /* Treat file as ascii regardless of content */ +#define D_FOLDBLANKS 0x02 /* Treat all white space as equal */ +#define D_MINIMAL 0x04 /* Make diff as small as possible */ +#define D_IGNORECASE 0x08 /* Case-insensitive matching */ +#define D_PROTOTYPE 0x10 /* Display C function prototype */ +#define D_EXPANDTABS 0x20 /* Expand tabs to spaces */ +#define D_IGNOREBLANKS 0x40 /* Ignore white space changes */ /* * Status values for diffreg() return values @@ -105,7 +105,7 @@ void cvs_merge_file(struct cvs_file *, int); void diff_output(const char *, ...); int diffreg(const char *, const char *, int, int, BUF *, int); -int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); +int ed_patch_lines(struct rcs_lines *, struct rcs_lines *); extern int diff_format; extern int diff3_conflicts; @@ -116,11 +116,11 @@ extern int diff_iflag; extern int diff_pflag; extern int diff_wflag; extern char *diff_file; -extern char diffargs[128]; +extern char diffargs[512]; /* XXX */ extern BUF *diffbuf; extern RCSNUM *diff_rev1; extern RCSNUM *diff_rev2; extern RCSNUM *d3rev1; extern RCSNUM *d3rev2; -#endif +#endif /* DIFF_H */ |