===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/cvs/file.h	2004/12/02 06:54:15	1.10
--- src/usr.bin/cvs/file.h	2004/12/07 17:10:56	1.11
***************
*** 1,16 ****
! /*	$OpenBSD: file.h,v 1.10 2004/12/02 06:54:15 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
!  * All rights reserved. 
   *
!  * Redistribution and use in source and binary forms, with or without 
!  * modification, are permitted provided that the following conditions 
!  * are met: 
   *
!  * 1. Redistributions of source code must retain the above copyright 
!  *    notice, this list of conditions and the following disclaimer. 
   * 2. The name of the author may not be used to endorse or promote products
!  *    derived from this software without specific prior written permission. 
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
   * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
--- 1,16 ----
! /*	$OpenBSD: file.h,v 1.11 2004/12/07 17:10:56 tedu Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
!  * All rights reserved.
   *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
   *
!  * 1. Redistributions of source code must retain the above copyright
!  *    notice, this list of conditions and the following disclaimer.
   * 2. The name of the author may not be used to endorse or promote products
!  *    derived from this software without specific prior written permission.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
   * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
***************
*** 21,27 ****
   * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
   * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
   * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
!  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
   */
  
  #ifndef FILE_H
--- 21,27 ----
   * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
   * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
   * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
!  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
  #ifndef FILE_H
***************
*** 41,47 ****
  #define CVS_FILE_NBUCKETS     256
  
  
- 
  #define CF_STAT     0x01  /* obsolete */
  #define CF_IGNORE   0x02  /* apply regular ignore rules */
  #define CF_RECURSE  0x04  /* recurse on directory operations */
--- 41,46 ----
***************
*** 65,71 ****
   * a cvs_dir structure containing data specific to the directory (such as
   * the contents of the directory's CVS/Entries, CVS/Root, etc.).
   */
- 
  #define CVS_FST_UNKNOWN   0
  #define CVS_FST_UPTODATE  1
  #define CVS_FST_MODIFIED  2
--- 64,69 ----
***************
*** 74,80 ****
  #define CVS_FST_CONFLICT  5
  #define CVS_FST_PATCHED   6
  
!  
  struct cvs_fname {
  	char  *cf_name;
  	u_int  cf_ref;
--- 72,78 ----
  #define CVS_FST_CONFLICT  5
  #define CVS_FST_PATCHED   6
  
! 
  struct cvs_fname {
  	char  *cf_name;
  	u_int  cf_ref;