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 unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.34 2013/01/22 20:35:29 christos Exp $ 1# $NetBSD: Makefile,v 1.35 2013/01/22 22:40:31 christos Exp $
2# @(#)Makefile 8.1 (Berkeley) 5/31/93 2# @(#)Makefile 8.1 (Berkeley) 5/31/93
3# 3#
4# C Shell with process control; VM/UNIX VAX Makefile 4# C Shell with process control; VM/UNIX VAX Makefile
5# Bill Joy UC Berkeley; Jim Kulp IIASA, Austria 5# Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
6# 6#
7# To profile, put -DPROF in DFLAGS and -pg in COPTS, and recompile. 7# To profile, put -DPROF in DFLAGS and -pg in COPTS, and recompile.
8 8
9.include <bsd.own.mk> 9.include <bsd.own.mk>
10 10
11PROG= csh 11PROG= csh
12DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS 12DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS
13# - Not integrated with history 13# - Not integrated with history
14# - Does not handle escaped prompts. 14# - Does not handle escaped prompts.
@@ -51,22 +51,22 @@ const.h: const.c @@ -51,22 +51,22 @@ const.h: const.c
51.if make(install) 51.if make(install)
52SUBDIR+=USD.doc 52SUBDIR+=USD.doc
53.endif 53.endif
54 54
55# XXX Only GCC 4.1 problem 55# XXX Only GCC 4.1 problem
56.if defined(HAVE_GCC) && ${HAVE_GCC} == 4 && ${MACHINE_ARCH} == "vax" 56.if defined(HAVE_GCC) && ${HAVE_GCC} == 4 && ${MACHINE_ARCH} == "vax"
57COPTS.parse.c+= -O0 57COPTS.parse.c+= -O0
58.endif 58.endif
59COPTS.err.c = -Wno-format-nonliteral 59COPTS.err.c = -Wno-format-nonliteral
60COPTS.printf.c = -Wno-format-nonliteral 60COPTS.printf.c = -Wno-format-nonliteral
61COPTS.proc.c = -Wno-format-nonliteral 61COPTS.proc.c = -Wno-format-nonliteral
62 62
63.if 0 63.if 0
64LDADD+=-lutil 
65DPADD+=${LIBUTIL} 
66.elese 
67LDADD+=-ledit -lutil 64LDADD+=-ledit -lutil
68DPADD+=${LIBEDIT} ${LIBUTIL} 65DPADD+=${LIBEDIT} ${LIBUTIL}
 66.else
 67LDADD+=-lutil
 68DPADD+=${LIBUTIL}
69.endif 69.endif
70 70
71.include <bsd.prog.mk> 71.include <bsd.prog.mk>
72.include <bsd.subdir.mk> 72.include <bsd.subdir.mk>
cvs diff -r1.23 -r1.24 src/bin/csh/csh.h (expand / switch to unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: csh.h,v 1.23 2013/01/22 20:35:29 christos Exp $ */ 1/* $NetBSD: csh.h,v 1.24 2013/01/22 22:40:31 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1980, 1991, 1993 4 * Copyright (c) 1980, 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -542,17 +542,17 @@ Char *word_chars; @@ -542,17 +542,17 @@ Char *word_chars;
542 542
543Char *STR_SHELLPATH; 543Char *STR_SHELLPATH;
544 544
545#include <paths.h> 545#include <paths.h>
546#ifdef _PATH_BSHELL 546#ifdef _PATH_BSHELL
547Char *STR_BSHELL; 547Char *STR_BSHELL;
548#endif 548#endif
549Char *STR_WORD_CHARS; 549Char *STR_WORD_CHARS;
550Char **STR_environ; 550Char **STR_environ;
551 551
552#ifdef EDIT 552#ifdef EDIT
553#include <histedit.h> 553#include <histedit.h>
554EditLine *el; 554EditLine *el;
555int editing; 
556#endif 555#endif
 556int editing;
557 557
558#endif /* !_CSH_H_ */ 558#endif /* !_CSH_H_ */