summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/cvs.h
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2007-01-13 15:46:00 +0000
committerJoris Vink <joris@cvs.openbsd.org>2007-01-13 15:46:00 +0000
commit33da486f0b07596f8124fff0c7bac44afd3859d0 (patch)
tree18293dab0910cec80e5fc8d26099505f43364b08 /usr.bin/cvs/cvs.h
parentc8b3d5534051a076fe062300cf465e1d046d7d73 (diff)
remove BUF * argument from cvs_checkout_file() it will
no longer be used, ever.
Diffstat (limited to 'usr.bin/cvs/cvs.h')
-rw-r--r--usr.bin/cvs/cvs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index 099fe95891f..f7fc2dbf416 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cvs.h,v 1.128 2007/01/12 23:32:01 niallo Exp $ */
+/* $OpenBSD: cvs.h,v 1.129 2007/01/13 15:45:59 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -361,7 +361,7 @@ char * cvs_logmsg_create(struct cvs_flisthead *, struct cvs_flisthead *,
void cvs_update_local(struct cvs_file *);
void cvs_update_enterdir(struct cvs_file *);
void cvs_update_leavedir(struct cvs_file *);
-void cvs_checkout_file(struct cvs_file *, RCSNUM *, BUF *, int);
+void cvs_checkout_file(struct cvs_file *, RCSNUM *, int);
int update_has_conflict_markers(struct cvs_file *);
#define CO_MERGE 0x01