[BACK]Return to diff.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / rcs

Diff for /src/usr.bin/rcs/diff.h between version 1.1 and 1.2

version 1.1, 2006/04/26 02:55:13 version 1.2, 2006/05/05 15:47:36
Line 64 
Line 64 
  *      @(#)diffreg.c   8.1 (Berkeley) 6/6/93   *      @(#)diffreg.c   8.1 (Berkeley) 6/6/93
  */   */
   
 #ifndef CVS_DIFF_H  #ifndef RCS_DIFF_H
 #define CVS_DIFF_H  #define RCS_DIFF_H
   
 #include "buf.h"  #include "buf.h"
 #include "rcs.h"  #include "rcs.h"
   
 #define CVS_DIFF_DEFCTX 3       /* default context length */  
   
 /*  /*
  * Output format options   * Output format options
  */   */
Line 87 
Line 85 
  */   */
 #define D_SAME          0       /* Files are the same */  #define D_SAME          0       /* Files are the same */
 #define D_DIFFER        1       /* Files are different */  #define D_DIFFER        1       /* Files are different */
 #define D_BINARY        2       /* Binary files are different */  #define D_ERROR         2       /* An error occurred */
 #define D_COMMON        3       /* Subdirectory common to both dirs */  
 #define D_ONLY          4       /* Only exists in one directory */  
 #define D_MISMATCH1     5       /* path1 was a dir, path2 a file */  
 #define D_MISMATCH2     6       /* path1 was a file, path2 a dir */  
 #define D_ERROR         7       /* An error occurred */  
 #define D_SKIPPED1      8       /* path1 was a special file */  
 #define D_SKIPPED2      9       /* path2 was a special file */  
   
 struct rcs_lines;  struct rcs_lines;
   
Line 111 
Line 102 
 extern RCSNUM   *diff_rev1;  extern RCSNUM   *diff_rev1;
 extern RCSNUM   *diff_rev2;  extern RCSNUM   *diff_rev2;
   
 #endif  #endif  /* RCS_DIFF_H */

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2