diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-06-24 02:56:58 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-06-24 02:56:58 +0400 |
| commit | 85b995d4f16a88b5645c4fe439349a21f0fd65ee (patch) | |
| tree | 9ba90f71a0c629b5a8b7add03249620d1c1e0bcf | |
| parent | 6bda8defe92592970805d48e77031ace1c4a3414 (diff) | |
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.
| -rw-r--r-- | winsup/cygserver/shm.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rwxr-xr-x | winsup/cygwin/cygserver_shm.cc | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | winsup/cygwin/cygwin_ipc.h (renamed from winsup/cygwin/include/sys/ipc.h) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | winsup/cygwin/cygwin_shm.h (renamed from winsup/cygwin/include/sys/shm.h) | 2 | ||||
| -rw-r--r-- | winsup/cygwin/ipc.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/shm.cc | 2 |
7 files changed, 15 insertions, 7 deletions
diff --git a/winsup/cygserver/shm.cc b/winsup/cygserver/shm.cc index 1116bc809..dc5632355 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 <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 8c4f46ff3..24c2c8b8e 100644 --- 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 1116bc809..dc5632355 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 <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 index c718a173a..c718a173a 100644..100755 --- a/winsup/cygwin/include/sys/ipc.h +++ b/winsup/cygwin/cygwin_ipc.h diff --git a/winsup/cygwin/include/sys/shm.h b/winsup/cygwin/cygwin_shm.h index 208c5f29f..a3aa2f473 100644..100755 --- 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 1f496d328..65924b354 100644 --- 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 baea3a60e..c71c9402b 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 <sys/shm.h> +#include "cygwin_shm.h" #include "cygserver_shm.h" // FIXME IS THIS CORRECT |