* cygserver_shm.h: Replace <sys/shm.h> with "cygwin_shm.h" after

	merge from HEAD.
	* cygwin_ipc.h: Update with changes to include/sys/ipc.h lost in
	merge from HEAD.
	* cygwin_shm.h: Ditto.

1 files changed, 21 insertions, 15 deletions

diff --git a/winsup/cygwin/cygwin_ipc.h b/winsup/cygwin/cygwin_ipc.h
index c718a173a0e..f319aebeb54 100755
--- a/winsup/cygwin/cygwin_ipc.h
+++ b/winsup/cygwin/cygwin_ipc.h
@@ -9,16 +9,17 @@ 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
 
-#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 
+/*
+ * <sys/types.h> must be included before <sys/ipc.h>.  We aren't meant
+ * to automatically include it however.
  */
 
 struct ipc_perm {
@@ -29,25 +30,30 @@ struct ipc_perm {
   mode_t mode;
 }; 
 
-/* the mode flags used with the _get functions use the low order 9 bits for a mode 
- * request
+/*
+ * 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
+/* This is a value that will _never_ be a valid key from ftok(3). */
+#define IPC_PRIVATE ((key_t) -2)
 
-/* ctl commands 1000-1fff is ipc reserved */
-#define IPC_RMID 0x1003
-#define IPC_SET  0x1002
-#define IPC_STAT 0x1001
+/*
+ * 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);
 
-#endif /* _SYS_IPC_H */
-
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* _SYS_IPC_H */