Use cygwin_{shm,ipc}.h instead of /sys/{shm,ipc}.h throughout.

* sys/ipc.h: Remove.
* sys/shm.h: Remove.
* cygwin_ipc.h: New file.
* cygwin_shm.h: New file.

diff --git a/winsup/cygserver/shm.cc b/winsup/cygserver/shm.cc
index 1116bc8..dc56323 100644 (file)
--- 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 <sys/shm.h>
+#include "cygwin_shm.h"
 #undef __INSIDE_CYGWIN__
 #else
-#include <sys/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 8c4f46f..24c2c8b 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,13 @@
 2002-06-23  Christopher Faylor  <cgf@redhat.com>
 
+       Use cygwin_{shm,ipc}.h instead of /sys/{shm,ipc}.h throughout.
+       * sys/ipc.h: Remove.
+       * sys/shm.h: Remove.
+       * cygwin_ipc.h: New file.
+       * cygwin_shm.h: New file.
+
+2002-06-23  Christopher Faylor  <cgf@redhat.com>
+
        * cygwin.sc: Add recent changes from ld sources.
 
 2002-06-23  Conrad Scott  <conrad.scott@dsl.pipex.com>

diff --git a/winsup/cygwin/cygserver_shm.cc b/winsup/cygwin/cygserver_shm.cc
index 1116bc8..dc56323 100755 (executable)
--- 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 <sys/shm.h>
+#include "cygwin_shm.h"
 #undef __INSIDE_CYGWIN__
 #else
-#include <sys/shm.h>
+#include "cygwin_shm.h"
 #endif
 //#include "perprocess.h"
 #include <threaded_queue.h>

diff --git a/winsup/cygwin/include/sys/ipc.h b/winsup/cygwin/cygwin_ipc.h
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from winsup/cygwin/include/sys/ipc.h
rename to winsup/cygwin/cygwin_ipc.h

diff --git a/winsup/cygwin/include/sys/shm.h b/winsup/cygwin/cygwin_shm.h
old mode 100644 (file)
new mode 100755 (executable)
similarity index 98%
rename from winsup/cygwin/include/sys/shm.h
rename to winsup/cygwin/cygwin_shm.h
index 208c5f2..a3aa2f4
--- a/winsup/cygwin/include/sys/shm.h
+++ b/winsup/cygwin/cygwin_shm.h
@@ -17,7 +17,7 @@ extern "C"
 #ifndef _SYS_SHM_H
 #define _SYS_SHM_H
 
-#include <sys/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 1f496d3..65924b3 100644 (file)
--- a/winsup/cygwin/ipc.cc
+++ b/winsup/cygwin/ipc.cc
@@ -11,7 +11,7 @@
    details. */
 
 #include "winsup.h"
-#include <sys/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 baea3a6..c71c940 100644 (file)
--- 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 <sys/shm.h>
+#include "cygwin_shm.h"
 #include "cygserver_shm.h"
 
 // FIXME IS THIS CORRECT