celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject svn commit: r1640693 - /celix/trunk/deployment_admin/private/src/deployment_admin_activator.c
Date Thu, 20 Nov 2014 08:41:18 GMT
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);
 



Mime
View raw message