* include/cygwin/process.h: Move here from newlib.

	* exec.cc: Change include of process.h to reflect the fact that it's
	now in the include/cygwin subfolder.
	* spawn.cc: Ditto.
	* syscalls.cc: Ditto.

5 files changed, 57 insertions, 6 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ee9e6723b..4fec5fdbd 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,13 @@
 2012-01-09  Corinna Vinschen  <corinna@vinschen.de>
 
+	* include/cygwin/process.h: Move here from newlib.
+	* exec.cc: Change include of process.h to reflect the fact that it's
+	now in the include/cygwin subfolder.
+	* spawn.cc: Ditto.
+	* syscalls.cc: Ditto.
+
+2012-01-09  Corinna Vinschen  <corinna@vinschen.de>
+
 	* miscfuncs.cc (thread_wrapper): Make sure stack is 16 byte aligned
 	to make gcc-3 compiled pthread applications happy.
 
diff --git a/winsup/cygwin/exec.cc b/winsup/cygwin/exec.cc
index 2ec298ffc..039b820ba 100644
--- a/winsup/cygwin/exec.cc
+++ b/winsup/cygwin/exec.cc
@@ -1,6 +1,6 @@
 /* exec.cc: exec system call support.
 
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2009, 2011 Red Hat, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2009, 2011, 2012 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -9,7 +9,7 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "winsup.h"
-#include <process.h>
+#include <cygwin/process.h>
 #include "cygerrno.h"
 #include "path.h"
 #include "environ.h"
diff --git a/winsup/cygwin/include/cygwin/process.h b/winsup/cygwin/include/cygwin/process.h
new file mode 100644
index 000000000..0436102b5
--- /dev/null
+++ b/winsup/cygwin/include/cygwin/process.h
@@ -0,0 +1,43 @@
+/* cygwin/process.h.  Define spawn family of functions as provided by Cygwin.
+   The original file of this name is a MS/DOS invention.
+   
+This file is part of Cygwin.
+
+This software is a copyrighted work licensed under the terms of the
+Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+details. */
+
+#ifndef __PROCESS_H_
+#define __PROCESS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For the exec functions, include unistd.h. */
+
+int spawnl(int mode, const char *path, const char *argv0, ...);
+int spawnle(int mode, const char *path, const char *argv0, ... /*, char * const *envp */);
+int spawnlp(int mode, const char *path, const char *argv0, ...);
+int spawnlpe(int mode, const char *path, const char *argv0, ... /*, char * const *envp */);
+
+int spawnv(int mode, const char *path, const char * const *argv);
+int spawnve(int mode, const char *path, const char * const *argv, const char * const *envp);
+int spawnvp(int mode, const char *path, const char * const *argv);
+int spawnvpe(int mode, const char *path, const char * const *argv, const char * const *envp);
+
+int cwait(int *, int, int);
+
+#define _P_WAIT		1
+#define _P_NOWAIT	2
+#define _P_OVERLAY	3
+#define _P_NOWAITO	4
+#define _P_DETACH	5
+
+#define WAIT_CHILD 1
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 1bf2d1dd0..74642519a 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -1,7 +1,7 @@
 /* spawn.cc
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
+   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -12,7 +12,7 @@ details. */
 #include "winsup.h"
 #include <stdlib.h>
 #include <unistd.h>
-#include <process.h>
+#include <cygwin/process.h>
 #include <sys/wait.h>
 #include <wingdi.h>
 #include <winuser.h>
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 3d67e637f..42c1924f5 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1,7 +1,7 @@
 /* syscalls.cc: syscalls
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
+   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -31,7 +31,7 @@ details. */
 #include <sys/statvfs.h> /* needed for statvfs */
 #include <stdlib.h>
 #include <stdio.h>
-#include <process.h>
+#include <cygwin/process.h>
 #include <utmp.h>
 #include <utmpx.h>
 #include <sys/uio.h>