[tor-commits] [tor/master] fixup! Move format_win32_error into lib/log/

[nickm at torproject.org]

commit 3d606dddb9a104466906069bd21acbdfb1270b58
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 27 12:35:48 2018 -0400

    fixup! Move format_win32_error into lib/log/
---
 configure.ac           | 2 +-
 src/lib/log/include.am | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6d112b8c2..c99f9eee9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,7 +422,7 @@ AH_BOTTOM([
 #endif
 ])
 
-
+AM_CONDITIONAL(WIN32, test "x$bwin32" = "xtrue")
 AM_CONDITIONAL(BUILD_NT_SERVICES, test "x$bwin32" = "xtrue")
 AM_CONDITIONAL(BUILD_LIBTORRUNNER, test "x$bwin32" != "xtrue")
 
diff --git a/src/lib/log/include.am b/src/lib/log/include.am
index 22b141d31..f0491b386 100644
--- a/src/lib/log/include.am
+++ b/src/lib/log/include.am
@@ -9,8 +9,11 @@ src_lib_libtor_log_a_SOURCES =			\
 	src/lib/log/escape.c			\
 	src/lib/log/ratelim.c			\
 	src/lib/log/torlog.c			\
-	src/lib/log/util_bug.c			\
-	src/lib/log/win32err.c
+	src/lib/log/util_bug.c
+
+if WIN32
+src_lib_libtor_log_a_SOURCES += src/lib/log/win32err.c
+endif
 
 src_lib_libtor_log_testing_a_SOURCES = \
 	$(src_lib_libtor_log_a_SOURCES)