diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /bin/csh | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
| download | src-test-98e0ffaefb0f241cda3a72395d3be04192ae0d47.tar.gz src-test-98e0ffaefb0f241cda3a72395d3be04192ae0d47.zip | |
Merge sync of head
Notes
Notes:
svn path=/projects/bmake/; revision=283595
Diffstat (limited to 'bin/csh')
| -rw-r--r-- | bin/csh/Makefile | 5 | ||||
| -rw-r--r-- | bin/csh/config.h | 2 | ||||
| -rw-r--r-- | bin/csh/iconv_stub.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index fd345245eb0b9..51ef3dd9c306b 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -40,8 +40,7 @@ MLINKS= csh.1 tcsh.1 # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAPW} ${LIBCRYPT} -LDADD= -ltermcapw -lcrypt +LIBADD= termcapw crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh @@ -94,7 +93,7 @@ GENHDRS+= iconv.h SRCS+= iconv_stub.c iconv.h: ${.CURDIR}/iconv_stub.h - cp -f ${.CURDIR}/iconv_stub.h ${.TARGET} + ${CP} ${.CURDIR}/iconv_stub.h ${.TARGET} .endif .endif diff --git a/bin/csh/config.h b/bin/csh/config.h index 99f7d0b6a1187..99aed5f7c64ea 100644 --- a/bin/csh/config.h +++ b/bin/csh/config.h @@ -198,7 +198,7 @@ #define HAVE_WCWIDTH 1 /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST const +#define ICONV_CONST /* Support NLS. */ #define NLS 1 diff --git a/bin/csh/iconv_stub.h b/bin/csh/iconv_stub.h index 89e9d0db59ac8..a3e069a06e316 100644 --- a/bin/csh/iconv_stub.h +++ b/bin/csh/iconv_stub.h @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); |