From 5c09431cc7c3843a26b2fcc8e52f56f3bba8abb6 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 3 Jan 2011 12:42:19 -0500 Subject: Never include pthread.h when building for Windows. On Windows, we never use pthreads, since it doesn't usually exist, and when it does it tends to be a little weirdly-behaved. But some mingw installations have a pthreads installed, so autoconf detects pthread.h and tells us about it. This would make us include pthread.h, which could make for trouble when the iffy pthread.h tried to include config.h. This patch changes compat.h so that we never include pthread.h on Windows. Fixes bug 2313; bugfix on 0.1.0.1-rc. --- src/common/compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/compat.h') diff --git a/src/common/compat.h b/src/common/compat.h index f1d869adfa..c7ed32b0d8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -31,7 +31,7 @@ #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_PTHREAD_H +#if defined(HAVE_PTHREAD_H) && !defined(MS_WINDOWS) #include #endif #include -- cgit v1.2.3-54-g00ecf