You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2012/11/29 09:16:54 UTC
svn commit: r1415076 - in /incubator/celix/trunk:
device_access/example/refining_driver/private/src/refining_driver.c
remote_services/topology_manager/private/src/topology_manager.c
Author: abroekhuis
Date: Thu Nov 29 08:16:52 2012
New Revision: 1415076
URL: http://svn.apache.org/viewvc?rev=1415076&view=rev
Log:
CELIX-42: Small changes due to windows support
Fixed some files still using the old Service Event Enum
Modified:
incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c
incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
Modified: incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c?rev=1415076&r1=1415075&r2=1415076&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c Thu Nov 29 08:16:52 2012
@@ -129,7 +129,7 @@ static celix_status_t refiningDriver_sto
static celix_status_t refiningDriver_serviceChanged(SERVICE_LISTENER listener, SERVICE_EVENT event) {
celix_status_t status = CELIX_SUCCESS;
refining_driver_device_t device = listener->handle;
- if (event->type == UNREGISTERING) {
+ if (event->type == SERVICE_EVENT_UNREGISTERING) {
bool equal = false;
status = serviceReference_equals(device->baseServiceReference, event->reference, &equal);
if (status == CELIX_SUCCESS && equal) {
Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c?rev=1415076&r1=1415075&r2=1415076&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c Thu Nov 29 08:16:52 2012
@@ -128,12 +128,12 @@ celix_status_t topologyManager_serviceCh
char *name = properties_get(props, (char *) OBJECTCLASS);
char *export = properties_get(props, (char *) SERVICE_EXPORTED_INTERFACES);
- if (event->type == REGISTERED) {
+ if (event->type == SERVICE_EVENT_REGISTERED) {
if (export != NULL) {
printf("TOPOLOGY_MANAGER: Service registered: %s\n", name);
status = topologyManager_exportService(manager, event->reference);
}
- } else if (event->type == UNREGISTERING) {
+ } else if (event->type == SERVICE_EVENT_UNREGISTERING) {
//if (export != NULL) {
printf("TOPOLOGY_MANAGER: Service unregistering: %s\n", name);
status = topologyManager_removeService(manager, event->reference);