diff options
author | Scott Lobdell <slobdell@google.com> | 2021-02-05 18:00:54 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-05 18:00:54 +0000 |
commit | c800319ca06bb624b67d33741336fa42e9dd2667 (patch) | |
tree | cae72caa0322a7ecec0fecf813ae0d7c14ffd980 /libc/upstream-openbsd/android/include/openbsd-compat.h | |
parent | ea1e0a27d3fb999f3015dfd7b42d9ba699284f10 (diff) | |
parent | 3cfe8f2ca3589184c6329a6fa4fadf7a5ebaa0d4 (diff) |
Merge "Merge SP1A.210122.003 Change-Id: I38a0c2cf0aed3762aafe4b1fa8a69dd03106fa39" into s-keystone-qcom-dev
Diffstat (limited to 'libc/upstream-openbsd/android/include/openbsd-compat.h')
-rw-r--r-- | libc/upstream-openbsd/android/include/openbsd-compat.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libc/upstream-openbsd/android/include/openbsd-compat.h b/libc/upstream-openbsd/android/include/openbsd-compat.h index 2fc5046ad..6c21c5b49 100644 --- a/libc/upstream-openbsd/android/include/openbsd-compat.h +++ b/libc/upstream-openbsd/android/include/openbsd-compat.h @@ -25,6 +25,8 @@ #include <sys/random.h> // For getentropy. +#include "private/bsd_sys_param.h" + #define __BEGIN_HIDDEN_DECLS _Pragma("GCC visibility push(hidden)") #define __END_HIDDEN_DECLS _Pragma("GCC visibility pop") @@ -57,10 +59,6 @@ extern const char* __progname; #define explicit_bzero(p, s) memset(p, 0, s) -/* OpenBSD has these in <sys/param.h>, but "ALIGN" isn't something we want to reserve. */ -#define ALIGNBYTES (sizeof(uintptr_t) - 1) -#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES) - /* OpenBSD has this in paths.h. But this directory doesn't normally exist. * Even when it does exist, only the 'shell' user has permissions. */ |