===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diff.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/diff/diff.h	2004/12/09 18:56:10	1.29
--- src/usr.bin/diff/diff.h	2009/06/06 15:00:27	1.30
***************
*** 1,4 ****
! /*	$OpenBSD: diff.h,v 1.29 2004/12/09 18:56:10 millert Exp $	*/
  
  /*-
   * Copyright (c) 1991, 1993
--- 1,4 ----
! /*	$OpenBSD: diff.h,v 1.30 2009/06/06 15:00:27 ray Exp $	*/
  
  /*-
   * Copyright (c) 1991, 1993
***************
*** 50,60 ****
  /*
   * Output flags
   */
! #define	D_HEADER	1	/* Print a header/footer between files */
! #define	D_EMPTY1	2	/* Treat first file as empty (/dev/null) */
! #define	D_EMPTY2	4	/* Treat second file as empty (/dev/null) */
  
  /*
   * Status values for print_status() and diffreg() return values
   */
  #define	D_SAME		0	/* Files are the same */
--- 50,71 ----
  /*
   * Output flags
   */
! #define	D_HEADER	0x001	/* Print a header/footer between files */
! #define	D_EMPTY1	0x002	/* Treat first file as empty (/dev/null) */
! #define	D_EMPTY2	0x004	/* Treat second file as empty (/dev/null) */
  
  /*
+  * Command line flags
+  */
+ #define D_FORCEASCII	0x008	/* Treat file as ascii regardless of content */
+ #define D_FOLDBLANKS	0x010	/* Treat all white space as equal */
+ #define D_MINIMAL	0x020	/* Make diff as small as possible */
+ #define D_IGNORECASE	0x040	/* Case-insensitive matching */
+ #define D_PROTOTYPE	0x080	/* Display C function prototype */
+ #define D_EXPANDTABS	0x100	/* Expand tabs to spaces */
+ #define D_IGNOREBLANKS	0x200	/* Ignore white space changes */
+ 
+ /*
   * Status values for print_status() and diffreg() return values
   */
  #define	D_SAME		0	/* Files are the same */
***************
*** 73,80 ****
  	struct excludes *next;
  };
  
! extern int	aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
! 		sflag, tflag, Tflag, wflag;
  extern int	format, context, status;
  extern char	*start, *ifdefname, *diffargs, *label[2], *ignore_pats;
  extern struct	stat stb1, stb2;
--- 84,90 ----
  	struct excludes *next;
  };
  
! extern int	lflag, Nflag, Pflag, rflag, sflag, Tflag;
  extern int	format, context, status;
  extern char	*start, *ifdefname, *diffargs, *label[2], *ignore_pats;
  extern struct	stat stb1, stb2;