From ce4c71aa68226d60299034fcf6d45add8d2a7c2b Mon Sep 17 00:00:00 2001
From: abd <abd@opencascade.com>
Date: Tue, 7 Oct 2008 11:52:50 +0000
Subject: [PATCH] Fix compilation errors on Win32 platform

---
 src/OCCViewer/OCCViewer_AxialScaleDlg.h |  2 +-
 src/ObjBrowser/OB.h                     | 21 +++++++++------------
 src/ObjBrowser/OB_ObjSearch.h           |  4 +++-
 src/Session/InquireServersQThread.cxx   |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.h b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
index c0dc9ed73..c79c6c3e4 100644
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.h
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
@@ -32,7 +32,7 @@ class QPushButton;
   \class OCCViewer_AxialScaleDlg
   \brief Dialog allowing to assign parameters of axes scaling
 */
-class OCCViewer_AxialScaleDlg : public QDialog
+class OCCVIEWER_EXPORT OCCViewer_AxialScaleDlg : public QDialog
 {
     Q_OBJECT
     
diff --git a/src/ObjBrowser/OB.h b/src/ObjBrowser/OB.h
index 8b243affe..03eec06b8 100755
--- a/src/ObjBrowser/OB.h
+++ b/src/ObjBrowser/OB.h
@@ -19,27 +19,24 @@
 #ifndef OB_H
 #define OB_H
 
-#if defined OB_EXPORTS
-#if defined WNT
-#define OB_EXPORT __declspec( dllexport )
+#ifdef WIN32
+# ifdef OB_EXPORTS
+#  define OB_EXPORT __declspec( dllexport )
+# else
+#  define OB_EXPORT __declspec( dllimport )
+# endif
 #else
-#define OB_EXPORT
-#endif
-#else
-#if defined WNT
-#define OB_EXPORT __declspec( dllimport )
-#else
-#define OB_EXPORT
-#endif
+# define OB_EXPORT
 #endif
 
+
 #if defined SOLARIS
 #define bool  int
 #define false 0
 #define true  1
 #endif
 
-#if defined WNT
+#if defined WIN32
 #pragma warning ( disable: 4251 )
 #endif
 
diff --git a/src/ObjBrowser/OB_ObjSearch.h b/src/ObjBrowser/OB_ObjSearch.h
index 6106d9fef..f945a5642 100644
--- a/src/ObjBrowser/OB_ObjSearch.h
+++ b/src/ObjBrowser/OB_ObjSearch.h
@@ -2,13 +2,15 @@
 #ifndef OBJECT_BROWSER_OBJECT_SEARCH_HEADER
 #define OBJECT_BROWSER_OBJECT_SEARCH_HEADER
 
+#include "OB.h"
+
 #include <qstring.h>
 
 class OB_ListItem;
 class OB_Browser;
 class SUIT_DataObject;
 
-class OB_ObjSearch
+class OB_EXPORT OB_ObjSearch
 {
 public:
   OB_ObjSearch( OB_Browser* );
diff --git a/src/Session/InquireServersQThread.cxx b/src/Session/InquireServersQThread.cxx
index e6bd3d763..0696942c5 100755
--- a/src/Session/InquireServersQThread.cxx
+++ b/src/Session/InquireServersQThread.cxx
@@ -50,7 +50,7 @@
 #include "Utils_SINGLETON.hxx"
 #include "SALOME_NamingService.hxx"
 #include "utilities.h"
-#include "OpUtil.hxx"
+#include "Basics_Utils.hxx"
 
 using namespace std;
 
-- 
2.39.2