From 7b04ecca2b527190791957515cd09cfc5be8405c Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 16 Aug 2004 16:34:00 +0000 Subject: [PATCH] I meant 2.2 --- ChangeLog.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/ssl.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 9a3580d13..204cdbb7d 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,8 @@ +2004-08-16 [colin] 0.9.12cvs64 + + * src/common/ssl.c + I meant 2.2. + 2004-08-16 [colin] 0.9.12cvs63 * src/common/ssl.c diff --git a/PATCHSETS b/PATCHSETS index 37fa84353..61be8bb1b 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -46,3 +46,4 @@ ( cvs diff -u -r 1.16 -r 1.17 src/common/ssl.c; ) > 0.9.12cvs62.patchset ( cvs diff -u -r 1.17 -r 1.18 src/common/ssl.c; ) > 0.9.12cvs63.patchset +( cvs diff -u -r 1.18 -r 1.19 src/common/ssl.c; ) > 0.9.12cvs64.patchset diff --git a/configure.ac b/configure.ac index 2b1e12f28..a1895d1bf 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=63 +EXTRA_VERSION=64 EXTRA_RELEASE= if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then diff --git a/src/common/ssl.c b/src/common/ssl.c index 5f483b1ec..b73966861 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -87,7 +87,7 @@ void *SSL_connect_thread(void *data) gint SSL_connect_nb(SSL *ssl) { -#if (defined USE_PTHREAD && defined __GLIBC__ && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 2) +#if (defined USE_PTHREAD && defined __GLIBC__ && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 3) thread_data *td = g_new0(thread_data, 1); pthread_t pt; void *res = NULL; -- 2.25.1