summaryrefslogtreecommitdiff
path: root/libc/sysdeps/unix/sysv/linux/bits
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2009-02-05 14:29:56 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2009-02-05 14:29:56 +0000
commit75b72fe085a17b1448190cb9d5cd31124320f3a3 (patch)
treed03f7df2e4be259f49eab256d4873d28a4d969a8 /libc/sysdeps/unix/sysv/linux/bits
parentf65fd29f5d77f3b1149d6238930243f628d35a08 (diff)
downloadeglibc2-75b72fe085a17b1448190cb9d5cd31124320f3a3.tar.gz
Merge changes between r7756 and r7867 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@7868 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/bits')
-rw-r--r--libc/sysdeps/unix/sysv/linux/bits/shm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/bits/shm.h b/libc/sysdeps/unix/sysv/linux/bits/shm.h
index 3f6315230..90ad0c718 100644
--- a/libc/sysdeps/unix/sysv/linux/bits/shm.h
+++ b/libc/sysdeps/unix/sysv/linux/bits/shm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,2000,2002,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,2000,2002,2004,2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -30,6 +30,7 @@
#define SHM_RDONLY 010000 /* attach read-only else read-write */
#define SHM_RND 020000 /* round attach address to SHMLBA */
#define SHM_REMAP 040000 /* take-over region on attach */
+#define SHM_EXEC 0100000 /* execution access */
/* Commands for `shmctl'. */
#define SHM_LOCK 11 /* lock segment (root only) */