From 85b995d4f16a88b5645c4fe439349a21f0fd65ee Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 23 Jun 2002 22:56:58 +0000 Subject: 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. --- winsup/cygserver/shm.cc | 4 +- winsup/cygwin/ChangeLog | 8 ++++ winsup/cygwin/cygserver_shm.cc | 4 +- winsup/cygwin/cygwin_ipc.h | 53 ++++++++++++++++++++++++ winsup/cygwin/cygwin_shm.h | 89 +++++++++++++++++++++++++++++++++++++++++ winsup/cygwin/include/sys/ipc.h | 53 ------------------------ winsup/cygwin/include/sys/shm.h | 89 ----------------------------------------- winsup/cygwin/ipc.cc | 2 +- winsup/cygwin/shm.cc | 2 +- 9 files changed, 156 insertions(+), 148 deletions(-) create mode 100755 winsup/cygwin/cygwin_ipc.h create mode 100755 winsup/cygwin/cygwin_shm.h delete mode 100644 winsup/cygwin/include/sys/ipc.h delete mode 100644 winsup/cygwin/include/sys/shm.h 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 +#include "cygwin_shm.h" #undef __INSIDE_CYGWIN__ #else -#include +#include "cygwin_shm.h" #endif //#include "perprocess.h" #include diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 8c4f46ff3..24c2c8b8e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2002-06-23 Christopher Faylor + + 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 * cygwin.sc: Add recent changes from ld sources. 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 +#include "cygwin_shm.h" #undef __INSIDE_CYGWIN__ #else -#include +#include "cygwin_shm.h" #endif //#include "perprocess.h" #include diff --git a/winsup/cygwin/cygwin_ipc.h b/winsup/cygwin/cygwin_ipc.h new file mode 100755 index 000000000..c718a173a --- /dev/null +++ b/winsup/cygwin/cygwin_ipc.h @@ -0,0 +1,53 @@ +/* sys/ipc.h + + Copyright 2001 Red Hat Inc. + Written by Robert Collins + +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. */ + +#ifdef __cplusplus +extern "C" +{ +#endif + +#ifndef _SYS_IPC_H +#define _SYS_IPC_H + +/* sys/types must be included before sys/ipc.h. We aren't meant to automatically + * include it however + */ + +struct ipc_perm { + uid_t uid; + gid_t gid; + uid_t cuid; + gid_t cgid; + mode_t mode; +}; + +/* the mode flags used with the _get functions use the low order 9 bits for a mode + * request + */ +#define IPC_CREAT 0x0200 +#define IPC_EXCL 0x0400 +#define IPC_NOWAIT 0x0800 + +/* this is a value that will _never_ be a valid key from ftok */ +#define IPC_PRIVATE -2 + +/* ctl commands 1000-1fff is ipc reserved */ +#define IPC_RMID 0x1003 +#define IPC_SET 0x1002 +#define IPC_STAT 0x1001 + +key_t ftok(const char *, int); + +#endif /* _SYS_IPC_H */ + +#ifdef __cplusplus +} +#endif diff --git a/winsup/cygwin/cygwin_shm.h b/winsup/cygwin/cygwin_shm.h new file mode 100755 index 000000000..a3aa2f473 --- /dev/null +++ b/winsup/cygwin/cygwin_shm.h @@ -0,0 +1,89 @@ +/* sys/shm.h + + Copyright 2001 Red Hat Inc. + Written by Robert Collins + +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. */ + +#ifdef __cplusplus +extern "C" +{ +#endif + +#ifndef _SYS_SHM_H +#define _SYS_SHM_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 + * file. + */ +#define SHMLBA 65536 +#define SHM_RND 1 + +typedef long int shmatt_t; + +#if defined(__INSIDE_CYGWIN__) && defined(__cplusplus) + +class _shmattach { +public: + void *data; + int shmflg; + class _shmattach *next; +}; + +class shmid_ds { +public: + struct ipc_perm shm_perm; + size_t shm_segsz; + pid_t shm_lpid; + pid_t shm_cpid; + shmatt_t shm_nattch; + time_t shm_atime; + time_t shm_dtime; + time_t shm_ctime; + void *mapptr; +}; + +class shmnode { +public: + class shmid_ds * shmds; + int shm_id; + class shmnode *next; + key_t key; + HANDLE filemap; + HANDLE attachmap; + class _shmattach *attachhead; +}; + +#else +/* this is what we return when queried. It has no bitwise correspondence + * the internal structures + */ +struct shmid_ds { + struct ipc_perm shm_perm; + size_t shm_segsz; + pid_t shm_lpid; + pid_t shm_cpid; + shmatt_t shm_nattch; + time_t shm_atime; + time_t shm_dtime; + time_t shm_ctime; +}; +#endif /* __INSIDE_CYGWIN__ */ + +void *shmat(int, const void *, int); +int shmctl(int, int, struct shmid_ds *); +int shmdt(const void *); +int shmget(key_t, size_t, int); + +#endif /* _SYS_SHM_H */ + +#ifdef __cplusplus +} +#endif diff --git a/winsup/cygwin/include/sys/ipc.h b/winsup/cygwin/include/sys/ipc.h deleted file mode 100644 index c718a173a..000000000 --- a/winsup/cygwin/include/sys/ipc.h +++ /dev/null @@ -1,53 +0,0 @@ -/* sys/ipc.h - - Copyright 2001 Red Hat Inc. - Written by Robert Collins - -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. */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#ifndef _SYS_IPC_H -#define _SYS_IPC_H - -/* sys/types must be included before sys/ipc.h. We aren't meant to automatically - * include it however - */ - -struct ipc_perm { - uid_t uid; - gid_t gid; - uid_t cuid; - gid_t cgid; - mode_t mode; -}; - -/* the mode flags used with the _get functions use the low order 9 bits for a mode - * request - */ -#define IPC_CREAT 0x0200 -#define IPC_EXCL 0x0400 -#define IPC_NOWAIT 0x0800 - -/* this is a value that will _never_ be a valid key from ftok */ -#define IPC_PRIVATE -2 - -/* ctl commands 1000-1fff is ipc reserved */ -#define IPC_RMID 0x1003 -#define IPC_SET 0x1002 -#define IPC_STAT 0x1001 - -key_t ftok(const char *, int); - -#endif /* _SYS_IPC_H */ - -#ifdef __cplusplus -} -#endif diff --git a/winsup/cygwin/include/sys/shm.h b/winsup/cygwin/include/sys/shm.h deleted file mode 100644 index 208c5f29f..000000000 --- a/winsup/cygwin/include/sys/shm.h +++ /dev/null @@ -1,89 +0,0 @@ -/* sys/shm.h - - Copyright 2001 Red Hat Inc. - Written by Robert Collins - -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. */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#ifndef _SYS_SHM_H -#define _SYS_SHM_H - -#include - -#define SHM_RDONLY 1 -/* 64 Kb was hardcoded for x86. MS states this may change, but we need it in the header - * file. - */ -#define SHMLBA 65536 -#define SHM_RND 1 - -typedef long int shmatt_t; - -#if defined(__INSIDE_CYGWIN__) && defined(__cplusplus) - -class _shmattach { -public: - void *data; - int shmflg; - class _shmattach *next; -}; - -class shmid_ds { -public: - struct ipc_perm shm_perm; - size_t shm_segsz; - pid_t shm_lpid; - pid_t shm_cpid; - shmatt_t shm_nattch; - time_t shm_atime; - time_t shm_dtime; - time_t shm_ctime; - void *mapptr; -}; - -class shmnode { -public: - class shmid_ds * shmds; - int shm_id; - class shmnode *next; - key_t key; - HANDLE filemap; - HANDLE attachmap; - class _shmattach *attachhead; -}; - -#else -/* this is what we return when queried. It has no bitwise correspondence - * the internal structures - */ -struct shmid_ds { - struct ipc_perm shm_perm; - size_t shm_segsz; - pid_t shm_lpid; - pid_t shm_cpid; - shmatt_t shm_nattch; - time_t shm_atime; - time_t shm_dtime; - time_t shm_ctime; -}; -#endif /* __INSIDE_CYGWIN__ */ - -void *shmat(int, const void *, int); -int shmctl(int, int, struct shmid_ds *); -int shmdt(const void *); -int shmget(key_t, size_t, int); - -#endif /* _SYS_SHM_H */ - -#ifdef __cplusplus -} -#endif 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 +#include "cygwin_ipc.h" #include 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 #include "thread.h" -#include +#include "cygwin_shm.h" #include "cygserver_shm.h" // FIXME IS THIS CORRECT -- cgit v1.2.3