commit 61a8495e1e0485bd40f613004bf29f8a925ab37c
author Andrew Top <aabtop@google.com> Tue Apr 30 15:07:33 2019 -0700
committer Andrew Top <aabtop@google.com> Thu May 02 17:06:51 2019 -0700
tree 8b4860759d8854c2c58b6db4cf3ad2bf3f68aa5c
parent 193dc3d54bfe1fcc7a4d95650f8e9f2c8d9e7d1e

Import Cobalt 19.master.0.203780

Includes the following patches:
  https://cobalt-review.googlesource.com/c/cobalt/+/5210
    by errong.leng@samsung.com
  https://cobalt-review.googlesource.com/c/cobalt/+/5270
    by linus.wang@samsung.com

src/sql/connection.cc

diff --git a/src/sql/connection.cc b/src/sql/connection.cc
index 6dc174e..0e60131 100644
--- a/src/sql/connection.cc
+++ b/src/sql/connection.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if defined(STARBOARD)
+#include "starboard/client_porting/poem/string_leaks_poem.h"
+#endif  // defined(STARBOARD)
+
 #include "sql/connection.h"
 
 #include <string.h>

src/sql/statement.cc

diff --git a/src/sql/statement.cc b/src/sql/statement.cc
index 7b65fa5..5068cc7 100644
--- a/src/sql/statement.cc
+++ b/src/sql/statement.cc
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if defined(STARBOARD)
+#include "starboard/client_porting/poem/string_leaks_poem.h"
+#endif  // defined(STARBOARD)
+
 #include "sql/statement.h"
 
 #include "base/logging.h"