Merged changes from HEAD

2 files changed, 0 insertions, 135 deletions

diff --git a/winsup/cygwin/include/sys/ipc.h b/winsup/cygwin/include/sys/ipc.h
deleted file mode 100644
index f319aebeb..000000000
--- a/winsup/cygwin/include/sys/ipc.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* sys/ipc.h
-
-   Copyright 2001 Red Hat Inc. 
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-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. */
-
-#ifndef _SYS_IPC_H
-#define _SYS_IPC_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/*
- * <sys/types.h> 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(3). */
-#define IPC_PRIVATE ((key_t) -2)
-
-/*
- * Values for the cmd argument to shmctl(2).
- * Commands 1000-1fff are reserved for IPC_xxx.
- */
-#define IPC_RMID 0x1000
-#define IPC_SET  0x1001
-#define IPC_STAT 0x1002
-#define IPC_INFO 0x1003		/* For ipcs(8). */
-
-key_t ftok(const char *, int);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SYS_IPC_H */
diff --git a/winsup/cygwin/include/sys/shm.h b/winsup/cygwin/include/sys/shm.h
deleted file mode 100644
index d6873d9ac..000000000
--- a/winsup/cygwin/include/sys/shm.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* sys/shm.h
-
-   Copyright 2001 Red Hat Inc. 
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-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. */
-
-#ifndef _SYS_SHM_H
-#define _SYS_SHM_H
-
-#include <sys/ipc.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/*
- * 64 Kb was hardcoded for x86. MS states this may change, but we need
- * it in the header file.
- */
-#define SHMLBA 65536
-
-/*
- * Values for the shmflg argument to shmat(2).
- */
-#define SHM_RDONLY 0x01		/* Attach read-only, not read/write. */
-#define SHM_RND    0x02		/* Round shmaddr down to multiple of SHMLBA. */
-
-/*
- * Values for the cmd argument to shmctl(2).
- * Commands 4000-4fff are reserved for SHM_xxx.
- */
-#define SHM_STAT   0x4000	/* For ipcs(8) */
-
-typedef long int shmatt_t;
-
-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;
-  long            shm_spare1;
-  time_t          shm_dtime;
-  long            shm_spare2;
-  time_t          shm_ctime;
-  long            shm_spare3;
-  long            shm_spare4[2];
-};
-
-/* Buffer type for shmctl(IPC_INFO, ...) as used by ipcs(8). */
-struct shminfo {
-  unsigned long shmmax;
-  unsigned long shmmin;
-  unsigned long shmmni;
-  unsigned long shmseg;
-  unsigned long shmall;
-  unsigned long shm_spare[4];
-};
-
-void *shmat(int shmid, const void *shmaddr, int shmflg);
-int   shmctl(int shmid, int cmd, struct shmid_ds *buf);
-int   shmdt(const void *shmaddr);
-int   shmget(key_t key, size_t size, int shmflg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SYS_SHM_H */