diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 20:44:25 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 20:44:25 -0300 |
| commit | 60153dd36e2a79150565635d1370ed64df7cc07d (patch) | |
| tree | fadc512853996f25c9d2a32d76d220ae17f7aad4 /extra/yassl/src | |
| parent | f6b5b2973074205300f9461676d98fdf92ae993c (diff) | |
| parent | 75a18e24fa72cca07254cbabd119b944c0ef989d (diff) | |
| download | mariadb-git-60153dd36e2a79150565635d1370ed64df7cc07d.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'extra/yassl/src')
| -rw-r--r-- | extra/yassl/src/Makefile.am | 2 | ||||
| -rw-r--r-- | extra/yassl/src/lock.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am index 6efd2220c54..300cdcd096f 100644 --- a/extra/yassl/src/Makefile.am +++ b/extra/yassl/src/Makefile.am @@ -5,4 +5,4 @@ libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \ template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h) -AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX +AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX @yassl_thread_cxxflags@ diff --git a/extra/yassl/src/lock.cpp b/extra/yassl/src/lock.cpp index 6d8e9c17477..6e85fefa14d 100644 --- a/extra/yassl/src/lock.cpp +++ b/extra/yassl/src/lock.cpp @@ -26,7 +26,7 @@ namespace yaSSL { -#ifdef MULTI_THREADED +#ifdef YASSL_THREAD_SAFE #ifdef _WIN32 Mutex::Mutex() @@ -79,7 +79,7 @@ namespace yaSSL { #endif // _WIN32 -#endif // MULTI_THREADED +#endif // YASSL_THREAD_SAFE |