diff options
author | Johann Koenig <johannkoenig@google.com> | 2017-05-15 21:21:45 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-15 21:21:45 +0000 |
commit | dac3b597219a2befd2f1dc1c9cd4ff347a90f572 (patch) | |
tree | 074db1ab18f1d1cdb977c537a6ac4cc439700faf | |
parent | 8739a182c8250d2e44cd01a7da0a58773e537b3b (diff) | |
parent | 3fbc371e999c00967441befb7082413dd533f9a2 (diff) | |
download | libvpx-dac3b597219a2befd2f1dc1c9cd4ff347a90f572.tar libvpx-dac3b597219a2befd2f1dc1c9cd4ff347a90f572.tar.gz libvpx-dac3b597219a2befd2f1dc1c9cd4ff347a90f572.tar.bz2 libvpx-dac3b597219a2befd2f1dc1c9cd4ff347a90f572.zip |
Merge "'protected' visibility unsupported on macho"
-rw-r--r-- | vpx_ports/mem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vpx_ports/mem.h b/vpx_ports/mem.h index 35751cef8..9c21532b1 100644 --- a/vpx_ports/mem.h +++ b/vpx_ports/mem.h @@ -23,7 +23,7 @@ #define DECLARE_ALIGNED(n, typ, val) typ val #endif -#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32) +#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32) && !defined(__MACH__) #define DECLARE_PROTECTED(decl) decl __attribute__((visibility("protected"))) #else #define DECLARE_PROTECTED(decl) decl |