diff options
author | Elliott Hughes <enh@google.com> | 2015-10-30 22:06:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-30 22:06:26 +0000 |
commit | bdac9ec142347a0dc9784bddd0f8336535e73529 (patch) | |
tree | c1e48628cf1282881c3efc2192d701fd07501449 | |
parent | e75453d5dd8b373f6e7ef61ec22a6a3074d51e02 (diff) | |
parent | 38eca07826f70a34fde05e6b858cb6e88cac3a55 (diff) | |
download | bionic-bdac9ec142347a0dc9784bddd0f8336535e73529.tar.gz |
Merge "Remove <sys/shm.h>."
-rw-r--r-- | libc/include/sys/shm.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/libc/include/sys/shm.h b/libc/include/sys/shm.h deleted file mode 100644 index c691c29fa..000000000 --- a/libc/include/sys/shm.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _SYS_SHM_H_ -#define _SYS_SHM_H_ - -#include <linux/shm.h> - -#endif /* _SYS_SHM_H_ */ |