diff options
| author | christos <christos@NetBSD.org> | 2011-08-14 11:46:28 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2011-08-14 11:46:28 +0000 |
| commit | 47c36408581bbb72f1eb3d92d237872c823f7bc1 (patch) | |
| tree | 300ed9f8867a399db55606856efc0865e374c828 /libexec | |
| parent | 5ffbf761fa0a668fdecd12049bbca25cd1255b3f (diff) | |
remove gcc-4.5 hack
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/Makefile | 7 | ||||
| -rw-r--r-- | libexec/ftpd/conf.c | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index ba547b19efd..9f9ba306939 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2011/06/22 02:49:43 mrg Exp $ +# $NetBSD: Makefile,v 1.63 2011/08/14 11:46:28 christos Exp $ # @(#)Makefile 8.2 (Berkeley) 4/4/94 .include <bsd.own.mk> @@ -52,8 +52,3 @@ ftpd.o ftpcmd.o: version.h #.endif .include <bsd.prog.mk> - -# XXX -.if ${HAVE_GCC} == 45 -COPTS.conf.c+= -Wno-error -.endif diff --git a/libexec/ftpd/conf.c b/libexec/ftpd/conf.c index 5a0ea16a34d..b5d7c0fb341 100644 --- a/libexec/ftpd/conf.c +++ b/libexec/ftpd/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.62 2009/03/15 07:48:36 lukem Exp $ */ +/* $NetBSD: conf.c,v 1.63 2011/08/14 11:46:28 christos Exp $ */ /*- * Copyright (c) 1997-2009 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: conf.c,v 1.62 2009/03/15 07:48:36 lukem Exp $"); +__RCSID("$NetBSD: conf.c,v 1.63 2011/08/14 11:46:28 christos Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -811,7 +811,7 @@ do_conversion(const char *fname) int o_errno; char *base = NULL; char *cmd, *p, *lp; - const char **argv; + char **argv; StringList *sl; o_errno = errno; @@ -860,10 +860,10 @@ do_conversion(const char *fname) if (sl_add(sl, NULL) == -1) goto cleanup_do_conv; - argv = (const char **)sl->sl_str; + argv = sl->sl_str; free(cmd); free(sl); - return(argv); + return (void *)(intptr_t)argv; cleanup_do_conv: if (sl) |
