Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 861C0C530 for ; Thu, 20 Nov 2014 08:41:40 +0000 (UTC) Received: (qmail 10786 invoked by uid 500); 20 Nov 2014 08:41:40 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 10758 invoked by uid 500); 20 Nov 2014 08:41:40 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 10749 invoked by uid 99); 20 Nov 2014 08:41:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Nov 2014 08:41:40 +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; Thu, 20 Nov 2014 08:41:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EE48223889D5; Thu, 20 Nov 2014 08:41:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1640693 - /celix/trunk/deployment_admin/private/src/deployment_admin_activator.c Date: Thu, 20 Nov 2014 08:41:18 -0000 To: commits@celix.apache.org From: bpetri@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141120084118.EE48223889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bpetri Date: Thu Nov 20 08:41:18 2014 New Revision: 1640693 URL: http://svn.apache.org/r1640693 Log: CELIX-186: fixed redefinition of activator_pt Modified: celix/trunk/deployment_admin/private/src/deployment_admin_activator.c Modified: celix/trunk/deployment_admin/private/src/deployment_admin_activator.c URL: http://svn.apache.org/viewvc/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c?rev=1640693&r1=1640692&r2=1640693&view=diff ============================================================================== --- celix/trunk/deployment_admin/private/src/deployment_admin_activator.c (original) +++ celix/trunk/deployment_admin/private/src/deployment_admin_activator.c Thu Nov 20 08:41:18 2014 @@ -28,19 +28,19 @@ #include "bundle_activator.h" #include "deployment_admin.h" -struct activator { +struct bundle_activator { apr_pool_t *pool; deployment_admin_pt admin; }; -typedef struct activator* activator_pt; +typedef struct bundle_activator* bundle_activator_pt; celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) { celix_status_t status = CELIX_SUCCESS; apr_pool_t *parentPool = NULL; apr_pool_t *pool = NULL; - activator_pt activator = NULL; + bundle_activator_pt activator = NULL; status = bundleContext_getMemoryPool(context, &parentPool); if (status == CELIX_SUCCESS) { @@ -78,7 +78,7 @@ celix_status_t bundleActivator_stop(void celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) { celix_status_t status = CELIX_SUCCESS; - activator_pt activator = (activator_pt) userData; + bundle_activator_pt activator = (bundle_activator_pt) userData; status = deploymentAdmin_destroy(activator->admin);