aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/windows_only_files4
-rw-r--r--src/common/compat_winthreads.c4
-rw-r--r--src/or/ntmain.c4
3 files changed, 12 insertions, 0 deletions
diff --git a/changes/windows_only_files b/changes/windows_only_files
new file mode 100644
index 0000000000..0ec64b9c43
--- /dev/null
+++ b/changes/windows_only_files
@@ -0,0 +1,4 @@
+ o Code simplification and refactoring:
+ - Wrap windows-only C files inside '#ifdef _WIN32' so that tools that
+ try to scan or compile every file on Unix won't decide that they
+ are broken.
diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c
index 71b994c4e4..465ef3ebed 100644
--- a/src/common/compat_winthreads.c
+++ b/src/common/compat_winthreads.c
@@ -3,6 +3,8 @@
* Copyright (c) 2007-2015, The Tor Project, Inc. */
/* See LICENSE for licensing information */
+#ifdef _WIN32
+
#include "compat.h"
#include <windows.h>
#include <process.h>
@@ -194,3 +196,5 @@ tor_threads_init(void)
set_main_thread();
}
+#endif
+
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index 22d381c438..b31ed869d6 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -3,6 +3,8 @@
* Copyright (c) 2007-2015, The Tor Project, Inc. */
/* See LICENSE for licensing information */
+#ifdef _WIN32
+
#include "or.h"
#include "config.h"
#include "main.h"
@@ -764,3 +766,5 @@ nt_service_parse_options(int argc, char **argv, int *should_exit)
return 0;
}
+#endif
+