From 3b8698d7bed1bcc8d0473188003a8e57871b0fd4 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 7 Feb 2012 17:15:07 +0000
Subject: 	* include/process.h: Move here from include/cygwin subdir. 
 * exec.cc: Change include of process.h to reflect the fact that it's 	now
 back in include. 	* spawn.cc: Ditto. 	* syscalls.cc: Ditto.

---
 winsup/cygwin/ChangeLog                |  8 +++++++
 winsup/cygwin/exec.cc                  |  2 +-
 winsup/cygwin/include/cygwin/process.h | 43 ----------------------------------
 winsup/cygwin/include/process.h        | 43 ++++++++++++++++++++++++++++++++++
 winsup/cygwin/spawn.cc                 |  2 +-
 winsup/cygwin/syscalls.cc              |  2 +-
 6 files changed, 54 insertions(+), 46 deletions(-)
 delete mode 100644 winsup/cygwin/include/cygwin/process.h
 create mode 100644 winsup/cygwin/include/process.h

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4c6a8d1b3..7b55f635e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-07  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/process.h: Move here from include/cygwin subdir.
+	* exec.cc: Change include of process.h to reflect the fact that it's
+	now back in include.
+	* spawn.cc: Ditto.
+	* syscalls.cc: Ditto.
+
 2012-02-07  Christopher Faylor  <me.cygwin2012@cgf.cx>
 
 	* cygheap.cc (init_cygheap::manage_console_count): Delete.
diff --git a/winsup/cygwin/exec.cc b/winsup/cygwin/exec.cc
index 039b820ba..29e7af53c 100644
--- a/winsup/cygwin/exec.cc
+++ b/winsup/cygwin/exec.cc
@@ -9,7 +9,7 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "winsup.h"
-#include <cygwin/process.h>
+#include <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
deleted file mode 100644
index 0436102b5..000000000
--- a/winsup/cygwin/include/cygwin/process.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* 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/include/process.h b/winsup/cygwin/include/process.h
new file mode 100644
index 000000000..0436102b5
--- /dev/null
+++ b/winsup/cygwin/include/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 1057247a0..b42e450c2 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -12,7 +12,7 @@ details. */
 #include "winsup.h"
 #include <stdlib.h>
 #include <unistd.h>
-#include <cygwin/process.h>
+#include <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 1c82c542f..e392220c3 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -31,7 +31,7 @@ details. */
 #include <sys/statvfs.h> /* needed for statvfs */
 #include <stdlib.h>
 #include <stdio.h>
-#include <cygwin/process.h>
+#include <process.h>
 #include <utmp.h>
 #include <utmpx.h>
 #include <sys/uio.h>
-- 
cgit v1.2.3