diff options
| author | Conrad Scott <conrad.scott@dsl.pipex.com> | 2002-09-21 17:11:45 +0400 |
|---|---|---|
| committer | Conrad Scott <conrad.scott@dsl.pipex.com> | 2002-09-21 17:11:45 +0400 |
| commit | a2205ae6401ebab39dfaab7755199a89c1803b29 (patch) | |
| tree | 5dc94e066e32262ba369a6ac166dbeed64db6611 | |
| parent | 5a9f50fac94a4eb4bbbc7e7515229216fa6d51fb (diff) | |
Merged changes from HEAD
| -rw-r--r-- | winsup/cygwin/ChangeLog | 10 | ||||
| -rw-r--r-- | winsup/cygwin/ipc.cc | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index e449240f8..12dca54e8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,15 @@ 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 Conrad Scott <conrad.scott@dsl.pipex.com> + * safe_memory.h (safe_delete): Make a templated function. * cygserver.cc (~server_request): Update use of safe_delete. (main): Ditto. diff --git a/winsup/cygwin/ipc.cc b/winsup/cygwin/ipc.cc index 1f496d328..4665fd84a 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" |