summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-22 17:02:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-22 17:02:25 +0000
commite9a6d0a09950b9d28f63c8bb3e05530cd23574c0 (patch)
tree43cd8ae401442ea125d06f0560317e11518ed453
parent80e160693c795aacfecd5ba34caa1485a6c717f4 (diff)
parent617681d355e086b5523278d5dd7e54548223e74d (diff)
downloadsystem_core-e9a6d0a09950b9d28f63c8bb3e05530cd23574c0.zip
system_core-e9a6d0a09950b9d28f63c8bb3e05530cd23574c0.tar.gz
system_core-e9a6d0a09950b9d28f63c8bb3e05530cd23574c0.tar.bz2
Merge "Remove unnecessary #includes of <sys/atomics.h>."
-rw-r--r--init/property_service.c1
-rw-r--r--toolbox/watchprops.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/init/property_service.c b/init/property_service.c
index 4bcf883..fb3bc8d 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -38,7 +38,6 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <sys/mman.h>
-#include <sys/atomics.h>
#include <private/android_filesystem_config.h>
#include <selinux/selinux.h>
diff --git a/toolbox/watchprops.c b/toolbox/watchprops.c
index 06cdebe..0d05aba 100644
--- a/toolbox/watchprops.c
+++ b/toolbox/watchprops.c
@@ -6,8 +6,6 @@
#include <cutils/properties.h>
#include <cutils/hashmap.h>
-#include <sys/atomics.h>
-
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h>