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

Diff for /src/usr.bin/cvs/diff.h between version 1.19 and 1.20

version 1.19, 2009/06/06 14:17:27 version 1.20, 2009/06/07 08:39:13
Line 89 
Line 89 
 #define D_IGNOREBLANKS  0x40    /* Ignore white space changes */  #define D_IGNOREBLANKS  0x40    /* Ignore white space changes */
   
 /*  /*
  * Status values for cvs_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 104 
Line 104 
   
 void            cvs_merge_file(struct cvs_file *, int);  void            cvs_merge_file(struct cvs_file *, int);
 void            diff_output(const char *, ...);  void            diff_output(const char *, ...);
 int             cvs_diffreg(const char *, const char *, int, int, BUF *, int);  int             diffreg(const char *, const char *, int, int, BUF *, int);
 int             ed_patch_lines(struct cvs_lines *, struct cvs_lines *);  int             ed_patch_lines(struct cvs_lines *, struct cvs_lines *);
   
 extern int       diff_format;  extern int       diff_format;
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20