[src/trunk]: src/libexec/ftpd remove gcc-4.5 hack

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/553beaf998c7
branches:  trunk
changeset: 768307:553beaf998c7
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 14 11:46:28 2011 +0000

description:
remove gcc-4.5 hack

diffstat:

 libexec/ftpd/Makefile |   7 +------
 libexec/ftpd/conf.c   |  10 +++++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diffs (58 lines):

diff -r beb833057d4d -r 553beaf998c7 libexec/ftpd/Makefile
--- a/libexec/ftpd/Makefile     Sun Aug 14 11:38:11 2011 +0000
+++ b/libexec/ftpd/Makefile     Sun Aug 14 11:46:28 2011 +0000
@@ -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 @@
 #.endif
 
 .include <bsd.prog.mk>
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.conf.c+= -Wno-error
-.endif
diff -r beb833057d4d -r 553beaf998c7 libexec/ftpd/conf.c
--- a/libexec/ftpd/conf.c       Sun Aug 14 11:38:11 2011 +0000
+++ b/libexec/ftpd/conf.c       Sun Aug 14 11:46:28 2011 +0000
@@ -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 @@
        int              o_errno;
        char            *base = NULL;
        char            *cmd, *p, *lp;
-       const char      **argv;
+       char           **argv;
        StringList      *sl;
 
        o_errno = errno;
@@ -860,10 +860,10 @@
 
        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)