=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff.h,v retrieving revision 1.19 retrieving revision 1.20 diff -c -r1.19 -r1.20 *** src/usr.bin/cvs/diff.h 2009/06/06 14:17:27 1.19 --- src/usr.bin/cvs/diff.h 2009/06/07 08:39:13 1.20 *************** *** 1,4 **** ! /* $OpenBSD: diff.h,v 1.19 2009/06/06 14:17:27 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: diff.h,v 1.20 2009/06/07 08:39:13 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. *************** *** 89,95 **** #define D_IGNOREBLANKS 0x40 /* Ignore white space changes */ /* ! * Status values for cvs_diffreg() return values */ #define D_SAME 0 /* Files are the same */ #define D_DIFFER 1 /* Files are different */ --- 89,95 ---- #define D_IGNOREBLANKS 0x40 /* Ignore white space changes */ /* ! * Status values for diffreg() return values */ #define D_SAME 0 /* Files are the same */ #define D_DIFFER 1 /* Files are different */ *************** *** 104,110 **** void cvs_merge_file(struct cvs_file *, int); void diff_output(const char *, ...); ! int cvs_diffreg(const char *, const char *, int, int, BUF *, int); int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); extern int diff_format; --- 104,110 ---- 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 *); extern int diff_format;