commit 087e2c43c01c11433d9c1d4e6d7d6524e423f209
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:41:58 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:41:58 2022 +0000
tree 54b99cb24fcf8b51ead1df6de6f422f77cd95103
parent 61da68cd973041f2d9f6187ce9c55258c6cad500
parent 947104c1c6da65e812ae4b47622bcf43e33961c4

Snap for 8730993 from 947104c1c6da65e812ae4b47622bcf43e33961c4 to mainline-tzdata3-release

Change-Id: I2f939a9db16a7515720fa8e5f8d1521382a6bf5e

OWNERS

diff --git a/OWNERS b/OWNERS
index 3414a74..9512b05 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,3 @@
-include platform/art:/OWNERS
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+allight@google.com

src/solaris/javavm/export/jvm_md.h

diff --git a/src/solaris/javavm/export/jvm_md.h b/src/solaris/javavm/export/jvm_md.h
index 62415ee..5c68191 100644
--- a/src/solaris/javavm/export/jvm_md.h
+++ b/src/solaris/javavm/export/jvm_md.h
@@ -65,7 +65,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <signal.h>
+#include <sys/signal.h>
 
 /* O Flags */
 

src/solaris/transport/socket/socket_md.c

diff --git a/src/solaris/transport/socket/socket_md.c b/src/solaris/transport/socket/socket_md.c
index 819fcab..33e062e 100644
--- a/src/solaris/transport/socket/socket_md.c
+++ b/src/solaris/transport/socket/socket_md.c
@@ -37,7 +37,7 @@
 #include <thread.h>
 #else
 #include <pthread.h>
-#include <poll.h>
+#include <sys/poll.h>
 #endif
 
 #include "socket_md.h"