Fix of build problems under WIN32 platform

diff --git a/src/PVServerService/ServiceLoader/CMakeLists.txt b/src/PVServerService/ServiceLoader/CMakeLists.txt
index 35c4f558e9c178e2f247782e9154212d95ea2637..1372bc5c069d00a58f26739e82f2c1db5ebbc7b9 100644 (file)
--- a/src/PVServerService/ServiceLoader/CMakeLists.txt
+++ b/src/PVServerService/ServiceLoader/CMakeLists.txt
@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES(
   )
 
 ADD_DEFINITIONS(
+  ${OMNIORB_DEFINITIONS}
   ${KERNEL_DEFINITIONS}
   )
 

diff --git a/src/PVServerService/ServiceLoader/PVServerServiceLoader.h b/src/PVServerService/ServiceLoader/PVServerServiceLoader.h
new file mode 100644 (file)
index 0000000..32bd4a4
--- /dev/null
+++ b/src/PVServerService/ServiceLoader/PVServerServiceLoader.h
@@ -0,0 +1,33 @@
+// Copyright (C) 2010-2015  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef PVSERVERSERVICELOADER_H
+#define PVSERVERSERVICELOADER_H
+
+#ifdef WIN32
+#if defined PVServerServiceLoader_EXPORTS
+#define PVSERVERSERVICELOADER_EXPORT __declspec(dllexport)
+#else
+#define PVSERVERSERVICELOADER_EXPORT __declspec(dllimport)
+#endif
+#else
+#define PVSERVERSERVICELOADER_EXPORT
+#endif
+
+#endif //PVSERVERSERVICELOADER_H

diff --git a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.h b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.h
index 7a443eb3da6f7f56dce2449aaa47918ba4233d04..2d364b04319c483e972b09482e0cb3dbc5b0d254 100644 (file)
--- a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.h
+++ b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.h
@@ -21,14 +21,14 @@
 #ifndef PVSERVERSERVICELOADER_H_
 #define PVSERVERSERVICELOADER_H_
 
-#include "PVServerService.h"
+#include "PVServerServiceLoader.h"
 
 #include <SALOME_ContainerManager.hxx>
 
 class SALOME_LifeCycleCORBA;
 class SALOME_NamingService;
 
-class PVSERVERSERVICE_EXPORT PVServer_ServiceLoader
+class PVSERVERSERVICELOADER_EXPORT PVServer_ServiceLoader
 {
 public:
   PVServer_ServiceLoader();