commit 61da68cd973041f2d9f6187ce9c55258c6cad500
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 17 07:32:07 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 17 07:32:07 2022 +0000
tree 10890d8dd037d9aabb8688de834fd98b0a8964f0
parent 947104c1c6da65e812ae4b47622bcf43e33961c4
parent a5d8524764012eec093f12f53f4e36886dd5b1c5

Snap for 8603585 from a5d8524764012eec093f12f53f4e36886dd5b1c5 to mainline-tzdata3-release

Change-Id: I30f58c5e29da92671ca0914b0c5cd34c4018b965

OWNERS

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

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 5c68191..62415ee 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 <sys/signal.h>
+#include <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 33e062e..819fcab 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 <sys/poll.h>
+#include <poll.h>
 #endif
 
 #include "socket_md.h"