Return-Path: X-Original-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C7142109A3 for ; Wed, 4 Jun 2014 07:58:36 +0000 (UTC) Received: (qmail 48535 invoked by uid 500); 4 Jun 2014 07:58:36 -0000 Delivered-To: apmail-incubator-celix-commits-archive@incubator.apache.org Received: (qmail 48511 invoked by uid 500); 4 Jun 2014 07:58:36 -0000 Mailing-List: contact celix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: celix-dev@incubator.apache.org Delivered-To: mailing list celix-commits@incubator.apache.org Received: (qmail 48504 invoked by uid 99); 4 Jun 2014 07:58:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2014 07:58:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2014 07:58:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 970B92388999; Wed, 4 Jun 2014 07:58:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1599963 - /incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c Date: Wed, 04 Jun 2014 07:58:15 -0000 To: celix-commits@incubator.apache.org From: pnoltes@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140604075815.970B92388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pnoltes Date: Wed Jun 4 07:58:15 2014 New Revision: 1599963 URL: http://svn.apache.org/r1599963 Log: CELIX-118: (re)added the APR_THREAD_FUNC marco to the deployment_admin. Modified: incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c Modified: incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c?rev=1599963&r1=1599962&r2=1599963&view=diff ============================================================================== --- incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c (original) +++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c Wed Jun 4 07:58:15 2014 @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -60,7 +61,7 @@ #define VERSIONS "/versions" -static void* deploymentAdmin_poll(apr_thread_t *thd, void *deploymentAdmin); +static void* APR_THREAD_FUNC deploymentAdmin_poll(apr_thread_t *thd, void *deploymentAdmin); celix_status_t deploymentAdmin_download(char * url, char **inputFile); size_t deploymentAdmin_writeData(void *ptr, size_t size, size_t nmemb, FILE *stream); static celix_status_t deploymentAdmin_deleteTree(char * directory, apr_pool_t *mp); @@ -164,7 +165,7 @@ static celix_status_t deploymentAdmin_up return status; } -static void * deploymentAdmin_poll(apr_thread_t *thd, void *deploymentAdmin) { +static void * APR_THREAD_FUNC deploymentAdmin_poll(apr_thread_t *thd, void *deploymentAdmin) { deployment_admin_pt admin = deploymentAdmin; /*first poll send framework started audit event, note this will register the target in Apache ACE*/