diff options
| author | Christopher Ferris <cferris@google.com> | 2014-06-13 13:57:51 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-06-18 14:23:46 -0700 |
| commit | 03eebcb6e8762e668a0d3af6bb303cccb88c5b81 (patch) | |
| tree | 3c5053d90eb3d1fac8c21fa390367a911e188191 /libc/bionic/system_properties.cpp | |
| parent | 64dfbd242cddc3ef95576e27e3940d68b89b5fce (diff) | |
| download | bionic-03eebcb6e8762e668a0d3af6bb303cccb88c5b81.zip bionic-03eebcb6e8762e668a0d3af6bb303cccb88c5b81.tar.gz bionic-03eebcb6e8762e668a0d3af6bb303cccb88c5b81.tar.bz2 | |
Move common macros into bionic_macros.h.
Bug: 15590152
Change-Id: I730636613ef3653f68c5ab1d43b53beaf8e0dc25
Diffstat (limited to 'libc/bionic/system_properties.cpp')
| -rw-r--r-- | libc/bionic/system_properties.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libc/bionic/system_properties.cpp b/libc/bionic/system_properties.cpp index 7618586..a564c39 100644 --- a/libc/bionic/system_properties.cpp +++ b/libc/bionic/system_properties.cpp @@ -55,9 +55,6 @@ #include "private/bionic_futex.h" #include "private/bionic_macros.h" -#define ALIGN(x, a) (((x) + (a - 1)) & ~(a - 1)) - - static const char property_service_socket[] = "/dev/socket/" PROP_SERVICE_NAME; @@ -301,7 +298,7 @@ static int map_prop_area() static void *allocate_obj(const size_t size, uint32_t *const off) { prop_area *pa = __system_property_area__; - const size_t aligned = ALIGN(size, sizeof(uint32_t)); + const size_t aligned = BIONIC_ALIGN(size, sizeof(uint32_t)); if (pa->bytes_used + aligned > pa_data_size) { return NULL; } |