[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.6 and 1.7

version 1.6, 2007/02/27 07:59:13 version 1.7, 2007/07/03 00:56:23
Line 96 
Line 96 
 #define D_IGNOREBLANKS  0x40    /* Ignore white space changes */  #define D_IGNOREBLANKS  0x40    /* Ignore white space changes */
   
 /*  /*
  * Status values for rcs_diffreg() return values   * Status values for diffreg() return values
  */   */
 #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 */
Line 112 
Line 112 
 BUF             *rcs_diff3(RCSFILE *, char *, RCSNUM *, RCSNUM *, int);  BUF             *rcs_diff3(RCSFILE *, char *, RCSNUM *, RCSNUM *, int);
 BUF             *merge_diff3(char **, int);  BUF             *merge_diff3(char **, int);
 void            diff_output(const char *, ...);  void            diff_output(const char *, ...);
 int             rcs_diffreg(const char *, const char *, BUF *, int);  int             diffreg(const char *, const char *, BUF *, int);
 int             ed_patch_lines(struct rcs_lines *, struct rcs_lines *);  int             ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
   
 extern int       diff_context;  extern int       diff_context;
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7