Browse Source

fixup! Move format_win32_error into lib/log/

Nick Mathewson 5 years ago
parent
commit
3d606dddb9
2 changed files with 6 additions and 3 deletions
  1. 1 1
      configure.ac
  2. 5 2
      src/lib/log/include.am

+ 1 - 1
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")
 

+ 5 - 2
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)