commit | a4573ec9efb566d8eedefec29b3c93213b1cae48 | [log] [tgz] |
---|---|---|
author | Primiano Tucci <primiano@google.com> | Tue Sep 25 06:52:35 2018 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 25 06:52:35 2018 +0000 |
tree | 53845994b4a07ca1d37c81603fb8d40d651c3be7 | |
parent | 21d41a77156da4d0bbdb6ea3edf1a77445dc6dec [diff] | |
parent | c5c8d936c089557b551068e3d1f8590663380e19 [diff] |
Merge "Fix mac build"
diff --git a/src/base/sock_utils.cc b/src/base/sock_utils.cc index 2efdbe2..d643d8d 100644 --- a/src/base/sock_utils.cc +++ b/src/base/sock_utils.cc
@@ -40,7 +40,9 @@ // The CMSG_* macros use NULL instead of nullptr. #pragma GCC diagnostic push +#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" +#endif ssize_t Send(int fd, const void* msg,