diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 17:09:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 17:09:43 +0000 |
| commit | 7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b (patch) | |
| tree | d597cb3a5c154580a6e56af9e2cd7ff571670c7d | |
| parent | affc6e809ddf774d646f859d70506eb9428d6619 (diff) | |
| parent | 337f94f1eb6d65e37689e78d9d33ae0a33ce6607 (diff) | |
| download | system_core-7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b.zip system_core-7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b.tar.gz system_core-7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b.tar.bz2 | |
am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes of <sys/atomics.h>."
* commit '337f94f1eb6d65e37689e78d9d33ae0a33ce6607':
Remove unnecessary #includes of <sys/atomics.h>.
| -rw-r--r-- | init/property_service.c | 1 | ||||
| -rw-r--r-- | toolbox/watchprops.c | 2 |
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> |