From 6791df696ef200a434d9aa87d76bde43663d1608 Mon Sep 17 00:00:00 2001 From: abd Date: Tue, 15 Aug 2006 13:17:08 +0000 Subject: [PATCH] Export symbols --- .../SALOMETraceCollector.cxx | 3 ++- .../SALOMETraceCollector.hxx | 16 ++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.cxx b/src/SALOMETraceCollector/SALOMETraceCollector.cxx index e1cab3182..408c56d87 100644 --- a/src/SALOMETraceCollector/SALOMETraceCollector.cxx +++ b/src/SALOMETraceCollector/SALOMETraceCollector.cxx @@ -67,7 +67,7 @@ BaseTraceCollector* SALOMETraceCollector::instance() sem_init(&_sem,0,0); // to wait until run thread is initialized pthread_t traceThread; - int bid; + int bid = 0; int re2 = pthread_create(&traceThread, NULL, SALOMETraceCollector::run, (void *)bid); sem_wait(&_sem); @@ -217,6 +217,7 @@ SALOMETraceCollector::SALOMETraceCollector() extern "C" { + SALOMETRACECOLLECTOR_EXPORT BaseTraceCollector *SingletonInstance(void) { BaseTraceCollector *instance = SALOMETraceCollector::instance(); diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.hxx b/src/SALOMETraceCollector/SALOMETraceCollector.hxx index c1258f63e..58e069efd 100644 --- a/src/SALOMETraceCollector/SALOMETraceCollector.hxx +++ b/src/SALOMETraceCollector/SALOMETraceCollector.hxx @@ -35,18 +35,14 @@ //! See LocalTraceCollector instead of SALOMETraceCollector, //! for usage without CORBA -#if defined SALOMETRACECOLLECTOR_EXPORTS -#if defined WIN32 -#define SALOMETRACECOLLECTOR_EXPORT __declspec( dllexport ) -#else -#define SALOMETRACECOLLECTOR_EXPORT -#endif -#else #if defined WNT -#define SALOMETRACECOLLECTOR_EXPORT __declspec( dllimport ) +# if defined SALOMETRACECOLLECTOR_EXPORTS +# define SALOMETRACECOLLECTOR_EXPORT __declspec( dllexport ) +# else +# define SALOMETRACECOLLECTOR_EXPORT +# endif #else -#define SALOMETRACECOLLECTOR_EXPORT -#endif +# define SALOMETRACECOLLECTOR_EXPORT #endif class SALOMETRACECOLLECTOR_EXPORT SALOMETraceCollector: -- 2.39.2