diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 13:18:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 13:18:33 -0500 |
| commit | 27cefef3a21e69d801c30d1450399b7d034c0f20 (patch) | |
| tree | 116739a8a3be1b994a9aa9fefc2afca8f715efa3 | |
| parent | bb5f99d4dfe119f82556ba4d9385d667a8414935 (diff) | |
| parent | 5c09431cc7c3843a26b2fcc8e52f56f3bba8abb6 (diff) | |
| download | tor-27cefef3a21e69d801c30d1450399b7d034c0f20.tar.gz tor-27cefef3a21e69d801c30d1450399b7d034c0f20.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | changes/bug2313 | 4 | ||||
| -rw-r--r-- | src/common/compat.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug2313 b/changes/bug2313 new file mode 100644 index 0000000000..0ffbe4ab07 --- /dev/null +++ b/changes/bug2313 @@ -0,0 +1,4 @@ + o Minor bugfixes + - Fix compilation on mingw when a pthreads compatibility library + has been installed. (We don't want to use it, so we shouldn't + be including pthread.h.) Fixes bug 2313; bugfix on 0.1.0.1-rc. diff --git a/src/common/compat.h b/src/common/compat.h index 01c94d5f4e..ee20e716c0 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -31,7 +31,7 @@ #ifdef HAVE_STRING_H #include <string.h> #endif -#ifdef HAVE_PTHREAD_H +#if defined(HAVE_PTHREAD_H) && !defined(MS_WINDOWS) #include <pthread.h> #endif #include <stdarg.h> |