diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-18 22:17:58 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-18 22:17:58 +0100 |
| commit | 529df9922d85574828d95020eebcd228ba3a8164 (patch) | |
| tree | 8524b46dd4bbbd163d4ce273ea6e82edd7c4b947 /syshead.h | |
| parent | eb208d36d466a1725e20e0a7aef39b1114b99e78 (diff) | |
| parent | 7c18c6353904f8c6e7f4eab3d13c985761ab80e5 (diff) | |
| download | openvpn-529df9922d85574828d95020eebcd228ba3a8164.tar.gz openvpn-529df9922d85574828d95020eebcd228ba3a8164.tar.xz openvpn-529df9922d85574828d95020eebcd228ba3a8164.zip | |
Merge branch 'feat_misc' into beta2.2
Conflicts:
acinclude.m4
config-win32.h
configure.ac
misc.c
thread.c
thread.h
- These conflicts was mainly due to feat_misc getting old
and mostly caused by the pthread clean-up patches in
feat_misc
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'syshead.h')
| -rw-r--r-- | syshead.h | 18 |
1 files changed, 0 insertions, 18 deletions
@@ -540,24 +540,6 @@ socket_defined (const socket_descriptor_t sd) #define ENABLE_BUFFER_LIST /* - * Do we have pthread capability? - */ -#ifdef USE_PTHREAD -#if defined(USE_CRYPTO) && defined(USE_SSL) && P2MP -#include <pthread.h> -#else -#undef USE_PTHREAD -#endif -#endif - -/* - * Pthread support is currently experimental (and quite unfinished). - */ -#if 1 /* JYFIXME -- if defined, disable pthread */ -#undef USE_PTHREAD -#endif - -/* * Should we include OCC (options consistency check) code? */ #ifndef ENABLE_SMALL |