Author: abroekhuis
Date: Tue Nov 27 12:27:13 2012
New Revision: 1414148
URL: http://svn.apache.org/viewvc?rev=1414148&view=rev
Log:
CELIX-42:Updated the log_writer to compile with Visual Studio
Modified:
incubator/celix/trunk/framework/CMakeLists.txt
incubator/celix/trunk/framework/public/include/service_tracker.h
incubator/celix/trunk/framework/public/include/service_tracker_customizer.h
incubator/celix/trunk/log_writer/private/src/dependency_activator.c
Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1414148&r1=1414147&r2=1414148&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Tue Nov 27 12:27:13 2012
@@ -56,7 +56,8 @@ if (FRAMEWORK)
public/include/framework.h public/include/properties.h
public/include/bundle_context.h public/include/bundle.h
public/include/bundle_activator.h
public/include/service_registration.h public/include/service_reference.h
- public/include/bundle_archive.h public/include/utils.h
public/include/module.h
+ public/include/bundle_archive.h public/include/utils.h
public/include/module.h public/include/service_tracker.h
+ public/include/service_tracker_customizer.h
${IO}
Modified: incubator/celix/trunk/framework/public/include/service_tracker.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_tracker.h?rev=1414148&r1=1414147&r2=1414148&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_tracker.h (original)
+++ incubator/celix/trunk/framework/public/include/service_tracker.h Tue Nov 27
12:27:13 2012
@@ -31,22 +31,23 @@
#include "array_list.h"
#include "bundle_context.h"
#include "service_tracker_customizer.h"
+#include "framework_exports.h"
typedef struct serviceTracker * service_tracker_t;
-celix_status_t serviceTracker_create(apr_pool_t *pool, bundle_context_t
context, char * service, service_tracker_customizer_t customizer,
service_tracker_t *tracker);
-celix_status_t serviceTracker_createWithFilter(apr_pool_t *pool,
bundle_context_t context, char * filter, service_tracker_customizer_t
customizer, service_tracker_t *tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_create(apr_pool_t *pool,
bundle_context_t context, char * service, service_tracker_customizer_t
customizer, service_tracker_t *tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_createWithFilter(apr_pool_t
*pool, bundle_context_t context, char * filter, service_tracker_customizer_t
customizer, service_tracker_t *tracker);
-celix_status_t serviceTracker_open(service_tracker_t tracker);
-celix_status_t serviceTracker_close(service_tracker_t tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_open(service_tracker_t tracker);
+FRAMEWORK_EXPORT celix_status_t serviceTracker_close(service_tracker_t
tracker);
-SERVICE_REFERENCE serviceTracker_getServiceReference(service_tracker_t
tracker);
-ARRAY_LIST serviceTracker_getServiceReferences(service_tracker_t tracker);
+FRAMEWORK_EXPORT SERVICE_REFERENCE
serviceTracker_getServiceReference(service_tracker_t tracker);
+FRAMEWORK_EXPORT ARRAY_LIST
serviceTracker_getServiceReferences(service_tracker_t tracker);
-void * serviceTracker_getService(service_tracker_t tracker);
-ARRAY_LIST serviceTracker_getServices(service_tracker_t tracker);
-void * serviceTracker_getServiceByReference(service_tracker_t tracker,
SERVICE_REFERENCE reference);
+FRAMEWORK_EXPORT void * serviceTracker_getService(service_tracker_t tracker);
+FRAMEWORK_EXPORT ARRAY_LIST serviceTracker_getServices(service_tracker_t
tracker);
+FRAMEWORK_EXPORT void * serviceTracker_getServiceByReference(service_tracker_t
tracker, SERVICE_REFERENCE reference);
-void serviceTracker_serviceChanged(SERVICE_LISTENER listener, SERVICE_EVENT
event);
+FRAMEWORK_EXPORT void serviceTracker_serviceChanged(SERVICE_LISTENER listener,
SERVICE_EVENT event);
#endif /* SERVICE_TRACKER_H_ */
Modified:
incubator/celix/trunk/framework/public/include/service_tracker_customizer.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/service_tracker_customizer.h?rev=1414148&r1=1414147&r2=1414148&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/service_tracker_customizer.h
(original)
+++ incubator/celix/trunk/framework/public/include/service_tracker_customizer.h
Tue Nov 27 12:27:13 2012
@@ -31,6 +31,7 @@
#include <apr_general.h>
#include "celix_errno.h"
+#include "framework_exports.h"
typedef celix_status_t (*addingCallback)(void *handle, SERVICE_REFERENCE
reference, void **service);
typedef celix_status_t (*addedCallback)(void * handle, SERVICE_REFERENCE
reference, void * service);
@@ -39,15 +40,15 @@ typedef celix_status_t (*removedCallback
typedef struct serviceTrackerCustomizer *service_tracker_customizer_t;
-celix_status_t serviceTrackerCustomizer_create(apr_pool_t *pool, void *handle,
+FRAMEWORK_EXPORT celix_status_t serviceTrackerCustomizer_create(apr_pool_t
*pool, void *handle,
addingCallback addingFunction, addedCallback addedFunction,
modifiedCallback modifiedFunction, removedCallback
removedFunction,
service_tracker_customizer_t *customizer);
-celix_status_t serviceTrackerCustomizer_getHandle(service_tracker_customizer_t
customizer, void **handle);
-celix_status_t
serviceTrackerCustomizer_getAddingFunction(service_tracker_customizer_t
customizer, addingCallback *function);
-celix_status_t
serviceTrackerCustomizer_getAddedFunction(service_tracker_customizer_t
customizer, addedCallback *function);
-celix_status_t
serviceTrackerCustomizer_getModifiedFunction(service_tracker_customizer_t
customizer, modifiedCallback *function);
-celix_status_t
serviceTrackerCustomizer_getRemovedFunction(service_tracker_customizer_t
customizer, removedCallback *function);
+FRAMEWORK_EXPORT celix_status_t
serviceTrackerCustomizer_getHandle(service_tracker_customizer_t customizer,
void **handle);
+FRAMEWORK_EXPORT celix_status_t
serviceTrackerCustomizer_getAddingFunction(service_tracker_customizer_t
customizer, addingCallback *function);
+FRAMEWORK_EXPORT celix_status_t
serviceTrackerCustomizer_getAddedFunction(service_tracker_customizer_t
customizer, addedCallback *function);
+FRAMEWORK_EXPORT celix_status_t
serviceTrackerCustomizer_getModifiedFunction(service_tracker_customizer_t
customizer, modifiedCallback *function);
+FRAMEWORK_EXPORT celix_status_t
serviceTrackerCustomizer_getRemovedFunction(service_tracker_customizer_t
customizer, removedCallback *function);
#endif /* service_tracker_customizer_t_H_ */
Modified: incubator/celix/trunk/log_writer/private/src/dependency_activator.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/private/src/dependency_activator.c?rev=1414148&r1=1414147&r2=1414148&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/private/src/dependency_activator.c
(original)
+++ incubator/celix/trunk/log_writer/private/src/dependency_activator.c Tue Nov
27 12:27:13 2012
@@ -35,10 +35,10 @@
void * dm_create(bundle_context_t context) {
apr_pool_t *pool;
+ log_writer_t writer = NULL;
bundleContext_getMemoryPool(context, &pool);
- log_writer_t writer = NULL;
logWriter_create(pool, &writer);
return writer;
}
