===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/cvs/diff.h	2009/06/07 08:39:13	1.20
--- src/usr.bin/cvs/diff.h	2010/07/23 21:46:05	1.21
***************
*** 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.
--- 1,4 ----
! /*	$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,70 ****
   *
   *	@(#)diffreg.c   8.1 (Berkeley) 6/6/93
   */
! #ifndef CVS_DIFF_H
! #define CVS_DIFF_H
  #define CVS_DIFF_DEFCTX	3	/* default context length */
  
  /*
--- 63,70 ----
   *
   *	@(#)diffreg.c   8.1 (Berkeley) 6/6/93
   */
! #ifndef DIFF_H
! #define DIFF_H
  #define CVS_DIFF_DEFCTX	3	/* default context length */
  
  /*
***************
*** 80,92 ****
  /*
   * 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 */
  
  /*
   * Status values for diffreg() return values
--- 80,92 ----
  /*
   * 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 */
  
  /*
   * Status values for diffreg() return values
***************
*** 105,111 ****
  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;
  extern int	 diff3_conflicts;
--- 105,111 ----
  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 rcs_lines *, struct rcs_lines *);
  
  extern int       diff_format;
  extern int	 diff3_conflicts;
***************
*** 116,126 ****
  extern int	 diff_pflag;
  extern int	 diff_wflag;
  extern char	*diff_file;
! extern char	 diffargs[128];
  extern BUF	*diffbuf;
  extern RCSNUM	*diff_rev1;
  extern RCSNUM	*diff_rev2;
  extern RCSNUM	*d3rev1;
  extern RCSNUM	*d3rev2;
  
! #endif
--- 116,126 ----
  extern int	 diff_pflag;
  extern int	 diff_wflag;
  extern char	*diff_file;
! extern char	 diffargs[512]; /* XXX */
  extern BUF	*diffbuf;
  extern RCSNUM	*diff_rev1;
  extern RCSNUM	*diff_rev2;
  extern RCSNUM	*d3rev1;
  extern RCSNUM	*d3rev2;
  
! #endif	/* DIFF_H */