Tue Jan 22 22:40:31 2013 UTC ()
fix compilation without -DEDIT


(christos)
diff -r1.34 -r1.35 src/bin/csh/Makefile
diff -r1.23 -r1.24 src/bin/csh/csh.h

cvs diff -r1.34 -r1.35 src/bin/csh/Makefile (expand / switch to context diff)
--- src/bin/csh/Makefile 2013/01/22 20:35:29 1.34
+++ src/bin/csh/Makefile 2013/01/22 22:40:31 1.35
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2013/01/22 20:35:29 christos Exp $
+#	$NetBSD: Makefile,v 1.35 2013/01/22 22:40:31 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -61,11 +61,11 @@
 COPTS.proc.c = -Wno-format-nonliteral
 
 .if 0
-LDADD+=-lutil
-DPADD+=${LIBUTIL}
-.elese
 LDADD+=-ledit -lutil
 DPADD+=${LIBEDIT} ${LIBUTIL}
+.else
+LDADD+=-lutil
+DPADD+=${LIBUTIL}
 .endif
 
 .include <bsd.prog.mk>

cvs diff -r1.23 -r1.24 src/bin/csh/csh.h (expand / switch to context diff)
--- src/bin/csh/csh.h 2013/01/22 20:35:29 1.23
+++ src/bin/csh/csh.h 2013/01/22 22:40:31 1.24
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.h,v 1.23 2013/01/22 20:35:29 christos Exp $ */
+/* $NetBSD: csh.h,v 1.24 2013/01/22 22:40:31 christos Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -552,7 +552,7 @@
 #ifdef EDIT
 #include <histedit.h>
 EditLine *el;
-int editing;
 #endif
+int editing;
 
 #endif /* !_CSH_H_ */