Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat Fix compilation
details: https://anonhg.NetBSD.org/src/rev/383b6d9457ae
branches: trunk
changeset: 762928:383b6d9457ae
user: joerg <joerg%NetBSD.org@localhost>
date: Sat Mar 05 23:51:47 2011 +0000
description:
Fix compilation
diffstat:
sys/compat/darwin/darwin_exec.h | 3 ++-
sys/compat/darwin/darwin_sysctl.c | 8 ++++----
sys/compat/mach/mach_exec.h | 3 ++-
3 files changed, 8 insertions(+), 6 deletions(-)
diffs (63 lines):
diff -r abf5cd24e572 -r 383b6d9457ae sys/compat/darwin/darwin_exec.h
--- a/sys/compat/darwin/darwin_exec.h Sat Mar 05 23:38:40 2011 +0000
+++ b/sys/compat/darwin/darwin_exec.h Sat Mar 05 23:51:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_exec.h,v 1.16 2008/11/19 18:36:02 ad Exp $ */
+/* $NetBSD: darwin_exec.h,v 1.17 2011/03/05 23:51:47 joerg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -49,6 +49,7 @@
#define DARWIN_DED_SIGEXC 1 /* Mach exceptions instead of signals */
+struct ps_strings;
int exec_darwin_copyargs(struct lwp *, struct exec_package *,
struct ps_strings *, char **, void *);
int exec_darwin_probe(const char **);
diff -r abf5cd24e572 -r 383b6d9457ae sys/compat/darwin/darwin_sysctl.c
--- a/sys/compat/darwin/darwin_sysctl.c Sat Mar 05 23:38:40 2011 +0000
+++ b/sys/compat/darwin/darwin_sysctl.c Sat Mar 05 23:51:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: darwin_sysctl.c,v 1.64 2011/03/04 22:25:30 joerg Exp $ */
+/* $NetBSD: darwin_sysctl.c,v 1.65 2011/03/05 23:51:47 joerg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_sysctl.c,v 1.64 2011/03/04 22:25:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_sysctl.c,v 1.65 2011/03/05 23:51:47 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -977,8 +977,8 @@
* copy argv and env at the same time, we add their lengths.
*/
nargv = pss.ps_nargvstr;
- nenv = pss.ps_nenvvstr;
- tmp = pss.ps_argvstr;
+ nenv = pss.ps_nenvstr;
+ tmp = (char *)pss.ps_argvstr;
nstr = nargv + nenv;
auio.uio_offset = (off_t)(long)tmp;
diff -r abf5cd24e572 -r 383b6d9457ae sys/compat/mach/mach_exec.h
--- a/sys/compat/mach/mach_exec.h Sat Mar 05 23:38:40 2011 +0000
+++ b/sys/compat/mach/mach_exec.h Sat Mar 05 23:51:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mach_exec.h,v 1.34 2010/07/07 01:30:36 chs Exp $ */
+/* $NetBSD: mach_exec.h,v 1.35 2011/03/05 23:51:47 joerg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -61,6 +61,7 @@
struct mach_port *mle_kernel; /* Thread's kernel port */
};
+struct ps_strings;
int exec_mach_copyargs(struct lwp *, struct exec_package *,
struct ps_strings *, char **, void *);
int exec_mach_probe(const char **);
Home |
Main Index |
Thread Index |
Old Index