CVS commit: [netbsd-6] src

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Thu Feb 23 18:34:33 UTC 2012

Modified Files:
        src/include [netbsd-6]: spawn.h
        src/lib/libc/gen [netbsd-6]: posix_spawnp.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #36):
        include/spawn.h: revision 1.4
        lib/libc/gen/posix_spawnp.c: revision 1.2
Use C++ compatible declaration for posix_spawn (instead of the C99 specific
posix one).


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/include/spawn.h
cvs rdiff -u -r1.1 -r1.1.2.1 src/lib/libc/gen/posix_spawnp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/include/spawn.h
diff -u src/include/spawn.h:1.1.2.1 src/include/spawn.h:1.1.2.2
--- src/include/spawn.h:1.1.2.1	Mon Feb 20 21:54:55 2012
+++ src/include/spawn.h	Thu Feb 23 18:34:33 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: spawn.h,v 1.1.2.1 2012/02/20 21:54:55 sborrill Exp $	*/
+/*	$NetBSD: spawn.h,v 1.1.2.2 2012/02/23 18:34:33 riz Exp $	*/
 
 /*-
  * Copyright (c) 2008 Ed Schouten <e...@freebsd.org>
@@ -40,10 +40,10 @@ __BEGIN_DECLS
  */
 int posix_spawn(pid_t * __restrict, const char * __restrict,
     const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
-    char * const [__restrict], char * const [__restrict]);
+    char * const *__restrict, char * const *__restrict);
 int posix_spawnp(pid_t * __restrict, const char * __restrict,
     const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
-    char * const [__restrict], char * const [__restrict]);
+    char * const *__restrict, char * const *__restrict);
 
 /*
  * File descriptor actions

Index: src/lib/libc/gen/posix_spawnp.c
diff -u src/lib/libc/gen/posix_spawnp.c:1.1 src/lib/libc/gen/posix_spawnp.c:1.1.2.1
--- src/lib/libc/gen/posix_spawnp.c:1.1	Sat Feb 11 23:31:24 2012
+++ src/lib/libc/gen/posix_spawnp.c	Thu Feb 23 18:34:33 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: posix_spawnp.c,v 1.1 2012/02/11 23:31:24 martin Exp $	*/
+/*	$NetBSD: posix_spawnp.c,v 1.1.2.1 2012/02/23 18:34:33 riz Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: posix_spawnp.c,v 1.1 2012/02/11 23:31:24 martin Exp $");
+__RCSID("$NetBSD: posix_spawnp.c,v 1.1.2.1 2012/02/23 18:34:33 riz Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: posix_spawnp.c,v 1.1 2
 int posix_spawnp(pid_t * __restrict pid, const char * __restrict file,
     const posix_spawn_file_actions_t *fa,
     const posix_spawnattr_t * __restrict sa,
-    char * const cav[__restrict], char * const env[__restrict])
+    char * const *__restrict cav, char * const *__restrict env)
 {
 	char fpath[FILENAME_MAX], *last, *p;
 	char *path;