commit 2c0ef345a049410908c051efce900d31e6f4450f
author Colin Cross <ccross@android.com> Wed Feb 02 19:50:22 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 02 19:50:22 2022 +0000
tree 419e837834d00746ff31650362aec5511446f964
parent 368dacea1a1b07b4bef604481c92bb66ef9cfe44
parent b4a98c305c8b8739e0503e2c77852e0b8a6c6fd2

Merge "Support building conscrypt against musl"

common/src/jni/main/cpp/conscrypt/native_crypto.cc

diff --git a/common/src/jni/main/cpp/conscrypt/native_crypto.cc b/common/src/jni/main/cpp/conscrypt/native_crypto.cc
index 0eb93c7..f1e3ff5 100644
--- a/common/src/jni/main/cpp/conscrypt/native_crypto.cc
+++ b/common/src/jni/main/cpp/conscrypt/native_crypto.cc
@@ -7055,7 +7055,8 @@
 
     // Packet preamble for text2pcap
     CONSCRYPT_LOG(LOG_INFO, LOG_TAG "-jni", "ssl=%p SSL_DATA: %c %ld.%06ld", ssl, direction,
-                  tv.tv_sec, static_cast<long>(tv.tv_usec));  // NOLINT(runtime/int)
+                  static_cast<long>(tv.tv_sec),
+                  static_cast<long>(tv.tv_usec));  // NOLINT(runtime/int)
 
     char out[kDataWidth * 3 + 1];
     for (size_t i = 0; i < len; i += kDataWidth) {