Return-Path: Mailing-List: contact python-cvs-help@httpd.apache.org; run by ezmlm Delivered-To: mailing list python-cvs@httpd.apache.org Received: (qmail 3974 invoked by uid 99); 11 Sep 2005 08:24:57 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 11 Sep 2005 01:24:57 -0700 Received: (qmail 92720 invoked by uid 65534); 11 Sep 2005 08:24:57 -0000 Message-ID: <20050911082457.92719.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r280095 - /httpd/mod_python/trunk/src/mod_python.c Date: Sun, 11 Sep 2005 08:24:56 -0000 To: python-cvs@httpd.apache.org From: nlehuen@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org Author: nlehuen Date: Sun Sep 11 01:24:53 2005 New Revision: 280095 URL: http://svn.apache.org/viewcvs?rev=280095&view=rev Log: APR_HAS_THREADS must be tested for truth value, not for definition. On minotaur, APR_HAS_THREADS is defined as 0. Modified: httpd/mod_python/trunk/src/mod_python.c Modified: httpd/mod_python/trunk/src/mod_python.c URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/mod_python.c?rev=280095&r1=280094&r2=280095&view=diff ============================================================================== --- httpd/mod_python/trunk/src/mod_python.c (original) +++ httpd/mod_python/trunk/src/mod_python.c Sun Sep 11 01:24:53 2005 @@ -31,7 +31,7 @@ * (In a Python dictionary) */ static PyObject * interpreters = NULL; -#if defined(WITH_THREAD) && defined(APR_HAS_THREADS) +#if defined(WITH_THREAD) && APR_HAS_THREADS static apr_thread_mutex_t* interpreters_lock = 0; #endif @@ -130,7 +130,7 @@ name = MAIN_INTERPRETER; #ifdef WITH_THREAD - #ifdef APR_HAS_THREADS + #if APR_HAS_THREADS apr_thread_mutex_lock(interpreters_lock); #endif PyEval_AcquireLock(); @@ -162,7 +162,7 @@ #ifdef WITH_THREAD PyEval_ReleaseLock(); - #ifdef APR_HAS_THREADS + #if APR_HAS_THREADS apr_thread_mutex_unlock(interpreters_lock); #endif #endif @@ -520,7 +520,7 @@ Py_Initialize(); #ifdef WITH_THREAD - #ifdef APR_HAS_THREADS + #if APR_HAS_THREADS apr_thread_mutex_create(&interpreters_lock,APR_THREAD_MUTEX_UNNESTED,p); #endif /* create and acquire the interpreter lock */