From 89d3ea5209e7e14eba871394fc39afc77664afe8 Mon Sep 17 00:00:00 2001
From: Kaido Kert <kaidokert@google.com>
Date: Tue, 2 Jul 2024 17:11:06 -0700
Subject: [PATCH] Clean up stray COBALT ifdefs (#3737)

Replace with STARBOARD for consistent usage across the codebase.

b/150410605
---
 third_party/boringssl/src/crypto/x509/by_dir.c     | 2 +-
 third_party/libxml/src/include/libxml/HTMLparser.h | 2 +-
 v8/src/base/platform/platform-win32.cc             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/third_party/boringssl/src/crypto/x509/by_dir.c b/third_party/boringssl/src/crypto/x509/by_dir.c
index 7045f0137abfa..7418503edacc4 100644
--- a/third_party/boringssl/src/crypto/x509/by_dir.c
+++ b/third_party/boringssl/src/crypto/x509/by_dir.c
@@ -131,7 +131,7 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
   switch (cmd) {
     case X509_L_ADD_DIR:
       if (argl == X509_FILETYPE_DEFAULT) {
-#if defined(COBALT)
+#if defined(OPENSSL_SYS_STARBOARD)
             // We don't expect to use the default certs dir.
             OPENSSL_PUT_ERROR(X509, X509_R_LOADING_CERT_DIR);
 #else
diff --git a/third_party/libxml/src/include/libxml/HTMLparser.h b/third_party/libxml/src/include/libxml/HTMLparser.h
index 65a6c39b60df4..de4c90a297de5 100644
--- a/third_party/libxml/src/include/libxml/HTMLparser.h
+++ b/third_party/libxml/src/include/libxml/HTMLparser.h
@@ -147,7 +147,7 @@ XMLPUBFUN int XMLCALL
 #if defined(STARBOARD)
 XMLPUBFUN void XMLCALL
 			htmlEmitImpliedRootLevelParagraph(int val);
-#endif  // defined(COBALT)
+#endif  // defined(STARBOARD)
 
 #ifdef LIBXML_PUSH_ENABLED
 /**
diff --git a/v8/src/base/platform/platform-win32.cc b/v8/src/base/platform/platform-win32.cc
index f1fe68305ee33..80e1ac0188205 100644
--- a/v8/src/base/platform/platform-win32.cc
+++ b/v8/src/base/platform/platform-win32.cc
@@ -656,7 +656,7 @@ int OS::SNPrintF(char* str, int length, const char* format, ...) {
 
 
 int OS::VSNPrintF(char* str, int length, const char* format, va_list args) {
-#if defined(COBALT)
+#if defined(V8_OS_STARBOARD)
   // In testing, _vsnprintf_s can fill result's tail with unexpected
   // characters if strlen(str) < length. Switching to vsnprintf is what Cobalt
   // uses for msvs platforms currently.