Module Name: src
Committed By: christos
Date: Tue Jan 22 22:40:31 UTC 2013
Modified Files:
src/bin/csh: Makefile csh.h
Log Message:
fix compilation without -DEDIT
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/bin/csh/Makefile
cvs rdiff -u -r1.23 -r1.24 src/bin/csh/csh.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/Makefile
diff -u src/bin/csh/Makefile:1.34 src/bin/csh/Makefile:1.35
--- src/bin/csh/Makefile:1.34 Tue Jan 22 15:35:29 2013
+++ src/bin/csh/Makefile Tue Jan 22 17:40:31 2013
@@ -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.printf.c = -Wno-format-nonliteral
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>
Index: src/bin/csh/csh.h
diff -u src/bin/csh/csh.h:1.23 src/bin/csh/csh.h:1.24
--- src/bin/csh/csh.h:1.23 Tue Jan 22 15:35:29 2013
+++ src/bin/csh/csh.h Tue Jan 22 17:40:31 2013
@@ -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 @@ Char **STR_environ;
#ifdef EDIT
#include <histedit.h>
EditLine *el;
-int editing;
#endif
+int editing;
#endif /* !_CSH_H_ */
