From e80af8953e7bab3a01047bb7b1bcb7c43dd47a0a Mon Sep 17 00:00:00 2001
From: Stefano Bonicatti <stefano.bonicatti@gmail.com>
Date: Fri, 8 Nov 2019 13:33:51 +0100
Subject: [PATCH] Do not use dllimport in glog on Windows (#6008)

Use osquery/logger.h instead of including glog headers.
Reduce warnings about locally defined and imported symbols.
---
 osquery/utils/conversions/BUCK                | 1 +
 osquery/utils/conversions/CMakeLists.txt      | 1 +
 osquery/utils/conversions/windows/strings.cpp | 3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osquery/utils/conversions/BUCK b/osquery/utils/conversions/BUCK
index da187ccc..53f2a0e8 100644
--- a/osquery/utils/conversions/BUCK
+++ b/osquery/utils/conversions/BUCK
@@ -62,6 +62,7 @@ osquery_cxx_library(
     visibility = ["PUBLIC"],
     deps = [
         ":to",
+        osquery_target("osquery/logger:logger"),
         osquery_target("osquery/utils/expected:expected"),
         osquery_tp_target("boost"),
         osquery_tp_target("glog"),
diff --git a/osquery/utils/conversions/CMakeLists.txt b/osquery/utils/conversions/CMakeLists.txt
index 78451e5c..38239433 100644
--- a/osquery/utils/conversions/CMakeLists.txt
+++ b/osquery/utils/conversions/CMakeLists.txt
@@ -41,6 +41,7 @@ function(generateOsqueryUtilsConversions)
 
   target_link_libraries(osquery_utils_conversions PUBLIC
     osquery_cxx_settings
+    osquery_logger
     osquery_utils_conversions_to
     osquery_utils_expected
     thirdparty_boost
diff --git a/osquery/utils/conversions/windows/strings.cpp b/osquery/utils/conversions/windows/strings.cpp
index dff70c06..25588716 100644
--- a/osquery/utils/conversions/windows/strings.cpp
+++ b/osquery/utils/conversions/windows/strings.cpp
@@ -9,8 +9,7 @@
 #include <codecvt>
 #include <string>
 
-#include <glog/logging.h>
-
+#include <osquery/logger.h>
 #include <osquery/utils/conversions/windows/strings.h>
 
 namespace osquery {