Module Name: src
Committed By: joerg
Date: Sat Mar 5 23:51:47 UTC 2011
Modified Files:
src/sys/compat/darwin: darwin_exec.h darwin_sysctl.c
src/sys/compat/mach: mach_exec.h
Log Message:
Fix compilation
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/darwin/darwin_exec.h
cvs rdiff -u -r1.64 -r1.65 src/sys/compat/darwin/darwin_sysctl.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/mach/mach_exec.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/darwin/darwin_exec.h
diff -u src/sys/compat/darwin/darwin_exec.h:1.16 src/sys/compat/darwin/darwin_exec.h:1.17
--- src/sys/compat/darwin/darwin_exec.h:1.16 Wed Nov 19 18:36:02 2008
+++ src/sys/compat/darwin/darwin_exec.h Sat Mar 5 23:51:47 2011
@@ -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 **);
Index: src/sys/compat/darwin/darwin_sysctl.c
diff -u src/sys/compat/darwin/darwin_sysctl.c:1.64 src/sys/compat/darwin/darwin_sysctl.c:1.65
--- src/sys/compat/darwin/darwin_sysctl.c:1.64 Fri Mar 4 22:25:30 2011
+++ src/sys/compat/darwin/darwin_sysctl.c Sat Mar 5 23:51:47 2011
@@ -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;
Index: src/sys/compat/mach/mach_exec.h
diff -u src/sys/compat/mach/mach_exec.h:1.34 src/sys/compat/mach/mach_exec.h:1.35
--- src/sys/compat/mach/mach_exec.h:1.34 Wed Jul 7 01:30:36 2010
+++ src/sys/compat/mach/mach_exec.h Sat Mar 5 23:51:47 2011
@@ -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 **);
