From 88cf6ffce3c01f4f1c50250ef46c0d7bf23f41c7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Thu, 25 Jun 2020 16:27:00 -0400
Subject: [PATCH] Rename logging->stdout to logging->stdout_

musl doesn't like this identifier
---
 src/libutil/logging.hh  | 2 +-
 src/nix/add-to-store.cc | 2 +-
 src/nix/eval.cc         | 2 +-
 src/nix/hash.cc         | 4 ++--
 src/nix/ls.cc           | 4 ++--
 src/nix/show-config.cc  | 2 +-
 src/nix/why-depends.cc  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh
index b1583eced..46deb89f7 100644
--- a/src/libutil/logging.hh
+++ b/src/libutil/logging.hh
@@ -87,7 +87,7 @@ public:
     virtual void writeToStdout(std::string_view s);
 
     template<typename... Args>
-    inline void stdout(const std::string & fs, const Args & ... args)
+    inline void stdout_(const std::string & fs, const Args & ... args)
     {
         boost::format f(fs);
         formatHelper(f, args...);
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
index f9d6de16e..745c24748 100644
--- a/src/nix/add-to-store.cc
+++ b/src/nix/add-to-store.cc
@@ -58,7 +58,7 @@ struct CmdAddToStore : MixDryRun, StoreCommand
             store->addToStore(info, source);
         }
 
-        logger->stdout("%s", store->printStorePath(info.path));
+        logger->stdout_("%s", store->printStorePath(info.path));
     }
 };
 
diff --git a/src/nix/eval.cc b/src/nix/eval.cc
index 26e98ac2a..53ec8c920 100644
--- a/src/nix/eval.cc
+++ b/src/nix/eval.cc
@@ -65,7 +65,7 @@ struct CmdEval : MixJSON, InstallableCommand
             printValueAsJSON(*state, true, *v, jsonOut, context);
         } else {
             state->forceValueDeep(*v);
-            logger->stdout("%s", *v);
+            logger->stdout_("%s", *v);
         }
     }
 };
diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index b97c6d21f..cdc8bf767 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -69,7 +69,7 @@ struct CmdHash : Command
 
             Hash h = hashSink->finish().first;
             if (truncate && h.hashSize > 20) h = compressHash(h, 20);
-            logger->stdout(h.to_string(base, base == SRI));
+            logger->stdout_(h.to_string(base, base == SRI));
         }
     }
 };
@@ -103,7 +103,7 @@ struct CmdToBase : Command
     void run() override
     {
         for (auto s : args)
-            logger->stdout(Hash(s, ht).to_string(base, base == SRI));
+            logger->stdout_(Hash(s, ht).to_string(base, base == SRI));
     }
 };
 
diff --git a/src/nix/ls.cc b/src/nix/ls.cc
index d2157f2d4..59922a8de 100644
--- a/src/nix/ls.cc
+++ b/src/nix/ls.cc
@@ -37,11 +37,11 @@ struct MixLs : virtual Args, MixJSON
                 auto line = fmt("%s %20d %s", tp, st.fileSize, relPath);
                 if (st.type == FSAccessor::Type::tSymlink)
                     line += " -> " + accessor->readLink(curPath);
-                logger->stdout(line);
+                logger->stdout_(line);
                 if (recursive && st.type == FSAccessor::Type::tDirectory)
                     doPath(st, curPath, relPath, false);
             } else {
-                logger->stdout(relPath);
+                logger->stdout_(relPath);
                 if (recursive) {
                     auto st = accessor->stat(curPath);
                     if (st.type == FSAccessor::Type::tDirectory)
diff --git a/src/nix/show-config.cc b/src/nix/show-config.cc
index 4fd8886de..a97dc42f9 100644
--- a/src/nix/show-config.cc
+++ b/src/nix/show-config.cc
@@ -25,7 +25,7 @@ struct CmdShowConfig : Command, MixJSON
             std::map<std::string, Config::SettingInfo> settings;
             globalConfig.getSettings(settings);
             for (auto & s : settings)
-                logger->stdout("%s = %s", s.first, s.second.value);
+                logger->stdout_("%s = %s", s.first, s.second.value);
         }
     }
 };
diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc
index 167c974ee..5e4d5fdcf 100644
--- a/src/nix/why-depends.cc
+++ b/src/nix/why-depends.cc
@@ -152,7 +152,7 @@ struct CmdWhyDepends : SourceExprCommand
             auto pathS = store->printStorePath(node.path);
 
             assert(node.dist != inf);
-            logger->stdout("%s%s%s%s" ANSI_NORMAL,
+            logger->stdout_("%s%s%s%s" ANSI_NORMAL,
                 firstPad,
                 node.visited ? "\e[38;5;244m" : "",
                 firstPad != "" ? "→ " : "",