From 20f44782bf1bb87069c43ff3f330e2dc4951a609 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Tue, 24 Jan 2023 09:18:25 -0800
Subject: Include Abseil logging in windows dll, and add a test helper dll.

This was tested with https://github.com/protocolbuffers/protobuf/pull/11623 in Protobuf's windows shared library build.

PiperOrigin-RevId: 504294227
Change-Id: I9657197e649a334585bffa2c7bc6340cd2354e84
---
 absl/log/internal/nullguard.cc | 6 +++---
 absl/log/internal/nullguard.h  | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'absl/log')

diff --git a/absl/log/internal/nullguard.cc b/absl/log/internal/nullguard.cc
index 7b785c55..4f2f9d40 100644
--- a/absl/log/internal/nullguard.cc
+++ b/absl/log/internal/nullguard.cc
@@ -23,11 +23,11 @@ namespace absl {
 ABSL_NAMESPACE_BEGIN
 namespace log_internal {
 
-ABSL_CONST_INIT const std::array<char, 7> kCharNull{
+ABSL_DLL ABSL_CONST_INIT const std::array<char, 7> kCharNull{
     {'(', 'n', 'u', 'l', 'l', ')', '\0'}};
-ABSL_CONST_INIT const std::array<signed char, 7> kSignedCharNull{
+ABSL_DLL ABSL_CONST_INIT const std::array<signed char, 7> kSignedCharNull{
     {'(', 'n', 'u', 'l', 'l', ')', '\0'}};
-ABSL_CONST_INIT const std::array<unsigned char, 7> kUnsignedCharNull{
+ABSL_DLL ABSL_CONST_INIT const std::array<unsigned char, 7> kUnsignedCharNull{
     {'(', 'n', 'u', 'l', 'l', ')', '\0'}};
 
 }  // namespace log_internal
diff --git a/absl/log/internal/nullguard.h b/absl/log/internal/nullguard.h
index a0ed4ad7..926f61bb 100644
--- a/absl/log/internal/nullguard.h
+++ b/absl/log/internal/nullguard.h
@@ -34,9 +34,11 @@ namespace absl {
 ABSL_NAMESPACE_BEGIN
 namespace log_internal {
 
-ABSL_CONST_INIT extern const std::array<char, 7> kCharNull;
-ABSL_CONST_INIT extern const std::array<signed char, 7> kSignedCharNull;
-ABSL_CONST_INIT extern const std::array<unsigned char, 7> kUnsignedCharNull;
+ABSL_DLL ABSL_CONST_INIT extern const std::array<char, 7> kCharNull;
+ABSL_DLL ABSL_CONST_INIT extern const std::array<signed char, 7>
+    kSignedCharNull;
+ABSL_DLL ABSL_CONST_INIT extern const std::array<unsigned char, 7>
+    kUnsignedCharNull;
 
 template <typename T>
 struct NullGuard final {
-- 
cgit v1.2.3