From 73e0cd439211fade82cac8c7218b39be2b675aca Mon Sep 17 00:00:00 2001
From: haozheng <haozheng@google.com>
Date: Wed, 27 Mar 2024 12:04:20 -0700
Subject: [PATCH] Add support for <errno.h> in Evergreen and Modular builds fix

Change-Id: Idb44248d7f5cfa8b54be581d2344b51ab533c9a9
---
 starboard/elf_loader/exported_symbols.cc                | 4 ++++
 starboard/nplb/posix_compliance/posix_errno_test.cc     | 5 +----
 third_party/musl/src/starboard/errno/__errno_location.c | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/starboard/elf_loader/exported_symbols.cc b/starboard/elf_loader/exported_symbols.cc
index 1f15a689d202..2fa417ac5be7 100644
--- a/starboard/elf_loader/exported_symbols.cc
+++ b/starboard/elf_loader/exported_symbols.cc
@@ -14,6 +14,10 @@
 
 #include "starboard/elf_loader/exported_symbols.h"
 
+#if SB_API_VERSION >= 16
+#include <errno.h>
+#endif  // SB_API_VERSION < 16
+
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <netdb.h>
diff --git a/starboard/nplb/posix_compliance/posix_errno_test.cc b/starboard/nplb/posix_compliance/posix_errno_test.cc
index 74e7ca97ce9f..d3ef7b46ed33 100644
--- a/starboard/nplb/posix_compliance/posix_errno_test.cc
+++ b/starboard/nplb/posix_compliance/posix_errno_test.cc
@@ -13,14 +13,11 @@
 // limitations under the License.
 
 #include <errno.h>
-#include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <unistd.h>
 
 #include "starboard/common/log.h"
-#include "starboard/nplb/socket_helpers.h"
+#include "starboard/nplb/posix_compliance/posix_socket_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace starboard {
diff --git a/third_party/musl/src/starboard/errno/__errno_location.c b/third_party/musl/src/starboard/errno/__errno_location.c
index 2beff14e9b8c..ecf93c02f170 100644
--- a/third_party/musl/src/starboard/errno/__errno_location.c
+++ b/third_party/musl/src/starboard/errno/__errno_location.c
@@ -1,3 +1,4 @@
+#if SB_API_VERSION < 16
 #include <errno.h>
 #include <stdlib.h>
 
@@ -39,3 +40,4 @@ int *__errno_location(void) {
 }
 
 weak_alias(__errno_location, ___errno_location);
+#endif  // SB_API_VERSION < 16