From: rnv <rnv@opencascade.com>
Date: Mon, 21 Feb 2022 16:03:29 +0000 (+0300)
Subject: Compilation under Windows.
X-Git-Tag: V9_9_0a1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=128c638578eac44060af460eed1260d38aa81f34;p=modules%2Fkernel.git

Compilation under Windows.
---

diff --git a/src/Logger/SALOME_Logger_Server.cxx b/src/Logger/SALOME_Logger_Server.cxx
index 3fda42741..80ddaad06 100644
--- a/src/Logger/SALOME_Logger_Server.cxx
+++ b/src/Logger/SALOME_Logger_Server.cxx
@@ -34,10 +34,6 @@
 # include <unistd.h>
 #endif
 
-#ifdef WIN32
-#include <omnithread/pthread_nt.h>
-#endif
-
 omni_mutex Logger::myLock;
 
 SALOME_Logger::Logger_ptr KERNEL::getLoggerServantSA()
diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 7377d7696..bc6fb68b8 100644
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -53,7 +53,7 @@
 
 namespace KERNEL
 {
-  SALOME_Logger::Logger_ptr getLoggerServantSA();
+  LOGGER_EXPORT SALOME_Logger::Logger_ptr getLoggerServantSA();
 }
 
 class LOGGER_EXPORT Logger :
diff --git a/src/NamingService/SALOME_NamingService_Abstract.hxx b/src/NamingService/SALOME_NamingService_Abstract.hxx
index 7c50c1721..dcaf1fcb9 100644
--- a/src/NamingService/SALOME_NamingService_Abstract.hxx
+++ b/src/NamingService/SALOME_NamingService_Abstract.hxx
@@ -61,7 +61,7 @@ public:
   static std::string BuildComponentName(const char* hostname, const char* containerName, const char* componentName, const int nbproc);
 };
 
-class SALOME_NamingService_Abstract_Decorator : public SALOME_NamingService_Abstract
+class NAMINGSERVICE_EXPORT SALOME_NamingService_Abstract_Decorator : public SALOME_NamingService_Abstract
 {
 public:
   SALOME_NamingService_Abstract_Decorator(SALOME_NamingService_Container_Abstract *ns_cont):_ns_cont(ns_cont) { }
diff --git a/src/SALOMETraceCollector/CMakeLists.txt b/src/SALOMETraceCollector/CMakeLists.txt
index 4ce179f9a..b6bfd678b 100644
--- a/src/SALOMETraceCollector/CMakeLists.txt
+++ b/src/SALOMETraceCollector/CMakeLists.txt
@@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PTHREAD_DEFINITIONS})
 ADD_LIBRARY(with_loggerTraceCollector SALOMETraceCollector.cxx TraceCollector_WaitForServerReadiness.cxx)
 
-TARGET_LINK_LIBRARIES(with_loggerTraceCollector ArgvKeeper SALOMELocalTrace OpUtil SalomeIDLKernel ${OMNIORB_LIBRARIES} ${PTHREAD_LIBRARIES})
+TARGET_LINK_LIBRARIES(with_loggerTraceCollector SalomeNS ArgvKeeper SALOMELocalTrace OpUtil SalomeIDLKernel ${OMNIORB_LIBRARIES} ${PTHREAD_LIBRARIES})
 INSTALL(TARGETS with_loggerTraceCollector EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")