Module Name: src
Committed By: christos
Date: Sun Aug 14 11:46:28 UTC 2011
Modified Files:
src/libexec/ftpd: Makefile conf.c
Log Message:
remove gcc-4.5 hack
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/libexec/ftpd/Makefile src/libexec/ftpd/conf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ftpd/Makefile
diff -u src/libexec/ftpd/Makefile:1.62 src/libexec/ftpd/Makefile:1.63
--- src/libexec/ftpd/Makefile:1.62 Tue Jun 21 22:49:43 2011
+++ src/libexec/ftpd/Makefile Sun Aug 14 07:46:28 2011
@@ -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
Index: src/libexec/ftpd/conf.c
diff -u src/libexec/ftpd/conf.c:1.62 src/libexec/ftpd/conf.c:1.63
--- src/libexec/ftpd/conf.c:1.62 Sun Mar 15 03:48:36 2009
+++ src/libexec/ftpd/conf.c Sun Aug 14 07:46:28 2011
@@ -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)
