From 9fc5ba965633662ea4460c69828e14b863791054 Mon Sep 17 00:00:00 2001
From: Conrad Scott <conrad.scott@dsl.pipex.com>
Date: Sat, 21 Sep 2002 13:03:24 +0000
Subject: [PATCH] 	* cygwin_ipc.h: Move to "include/cygwin/ipc.h". 
 * cygwin_shm.h: Move to "include/cygwin/shm.h". 	*
 include/cygwin/ipc.h: New file. 	* include/cygwin/shm.h: New file. 
 * ipc.c:c Update <cygwin/ipc.h> include. 	* cygserver_shm.cc: Update
 <cygwin/shm.h> include. 	* shm.cc: Ditto.

---
 winsup/cygserver/shm.cc                              |  4 ++--
 winsup/cygwin/ChangeLog                              | 10 ++++++++++
 winsup/cygwin/cygserver_shm.cc                       |  4 ++--
 winsup/cygwin/{cygwin_ipc.h => include/cygwin/ipc.h} |  0
 winsup/cygwin/{cygwin_shm.h => include/cygwin/shm.h} |  2 +-
 winsup/cygwin/ipc.cc                                 |  2 +-
 winsup/cygwin/shm.cc                                 |  2 +-
 7 files changed, 17 insertions(+), 7 deletions(-)
 rename winsup/cygwin/{cygwin_ipc.h => include/cygwin/ipc.h} (100%)
 mode change 100755 => 100644
 rename winsup/cygwin/{cygwin_shm.h => include/cygwin/shm.h} (98%)
 mode change 100755 => 100644

diff --git a/winsup/cygserver/shm.cc b/winsup/cygserver/shm.cc
index dc5632355..260a5b1bd 100644
--- a/winsup/cygserver/shm.cc
+++ b/winsup/cygserver/shm.cc
@@ -37,10 +37,10 @@ details. */
 //#include "thread.h"
 #ifndef __INSIDE_CYGWIN__
 #define __INSIDE_CYGWIN__
-#include "cygwin_shm.h"
+#include <cygwin/shm.h>
 #undef __INSIDE_CYGWIN__
 #else
-#include "cygwin_shm.h"
+#include <cygwin/shm.h>
 #endif
 //#include "perprocess.h"
 #include <threaded_queue.h>
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fa5f94f64..cf4c5c0ef 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-21  Conrad Scott  <conrad.scott@dsl.pipex.com>
+
+	* cygwin_ipc.h: Move to "include/cygwin/ipc.h".
+	* cygwin_shm.h: Move to "include/cygwin/shm.h".
+	* include/cygwin/ipc.h: New file.
+	* include/cygwin/shm.h: New file.
+	* ipc.c:c Update <cygwin/ipc.h> include.
+	* cygserver_shm.cc: Update <cygwin/shm.h> include.
+	* shm.cc: Ditto.
+
 2002-09-21  Robert Collins <rbtcollins@hotmail.com>
 
 	* pthread.cc: Use class::call for converted pthread and semaphore
diff --git a/winsup/cygwin/cygserver_shm.cc b/winsup/cygwin/cygserver_shm.cc
index dc5632355..260a5b1bd 100755
--- a/winsup/cygwin/cygserver_shm.cc
+++ b/winsup/cygwin/cygserver_shm.cc
@@ -37,10 +37,10 @@ details. */
 //#include "thread.h"
 #ifndef __INSIDE_CYGWIN__
 #define __INSIDE_CYGWIN__
-#include "cygwin_shm.h"
+#include <cygwin/shm.h>
 #undef __INSIDE_CYGWIN__
 #else
-#include "cygwin_shm.h"
+#include <cygwin/shm.h>
 #endif
 //#include "perprocess.h"
 #include <threaded_queue.h>
diff --git a/winsup/cygwin/cygwin_ipc.h b/winsup/cygwin/include/cygwin/ipc.h
old mode 100755
new mode 100644
similarity index 100%
rename from winsup/cygwin/cygwin_ipc.h
rename to winsup/cygwin/include/cygwin/ipc.h
diff --git a/winsup/cygwin/cygwin_shm.h b/winsup/cygwin/include/cygwin/shm.h
old mode 100755
new mode 100644
similarity index 98%
rename from winsup/cygwin/cygwin_shm.h
rename to winsup/cygwin/include/cygwin/shm.h
index a3aa2f473..eb037ba19
--- a/winsup/cygwin/cygwin_shm.h
+++ b/winsup/cygwin/include/cygwin/shm.h
@@ -17,7 +17,7 @@ extern "C"
 #ifndef _SYS_SHM_H
 #define _SYS_SHM_H
 
-#include "cygwin_ipc.h"
+#include <cygwin/ipc.h>
 
 #define SHM_RDONLY 1
 /* 64 Kb was hardcoded for x86. MS states this may change, but we need it in the header
diff --git a/winsup/cygwin/ipc.cc b/winsup/cygwin/ipc.cc
index 65924b354..4665fd84a 100644
--- a/winsup/cygwin/ipc.cc
+++ b/winsup/cygwin/ipc.cc
@@ -11,7 +11,7 @@
    details. */
 
 #include "winsup.h"
-#include "cygwin_ipc.h"
+#include <cygwin/ipc.h>
 #include <sys/stat.h>
 
 extern "C"
diff --git a/winsup/cygwin/shm.cc b/winsup/cygwin/shm.cc
index c71c9402b..400f204d8 100644
--- a/winsup/cygwin/shm.cc
+++ b/winsup/cygwin/shm.cc
@@ -22,7 +22,7 @@ details. */
 #include "cygheap.h"
 #include <stdio.h>
 #include "thread.h"
-#include "cygwin_shm.h"
+#include <cygwin/shm.h>
 #include "cygserver_shm.h"
 
 // FIXME IS THIS CORRECT