summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsprog.c
diff options
context:
space:
mode:
authorRay Lai <ray@cvs.openbsd.org>2006-04-01 05:58:18 +0000
committerRay Lai <ray@cvs.openbsd.org>2006-04-01 05:58:18 +0000
commit143730248bf47be98ceed1603bed218d2e51e045 (patch)
tree41769859d92f44d1e04220f61a22a3580bd22988 /usr.bin/rcs/rcsprog.c
parenta82452c39b21a9c02aad75021d2295506484d1fe (diff)
Keep cvs flags in `flags', rcs flags in `rcsflags' in rcsprog.h.
Prevents bitfield pollution between the two. ``This is how it should be.'' niallo@
Diffstat (limited to 'usr.bin/rcs/rcsprog.c')
-rw-r--r--usr.bin/rcs/rcsprog.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c
index 97568f280a6..9dbcd9b44f5 100644
--- a/usr.bin/rcs/rcsprog.c
+++ b/usr.bin/rcs/rcsprog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsprog.c,v 1.90 2006/03/28 09:51:09 xsa Exp $ */
+/* $OpenBSD: rcsprog.c,v 1.91 2006/04/01 05:58:17 ray Exp $ */
/*
* Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -39,12 +39,8 @@ const char rcs_version[] = "OpenCVS RCS version 3.6";
int verbose = 1;
int pipeout = 0;
-#define RCSPROG_EFLAG (1<<0)
-#define RCSPROG_NFLAG (1<<1)
-#define RCSPROG_TFLAG (1<<2)
-static int rcsflags = 0;
-
int flags;
+int rcsflags;
int rcs_optind;
char *rcs_optarg;
char *rcs_suffixes;