From: rnv <rnv@opencascade.com>
Date: Fri, 7 Sep 2018 08:40:44 +0000 (+0300)
Subject: Finalize windows porting
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frnv%2Fwindows_9.1.0;p=modules%2Fgeom.git

Finalize windows porting
---

diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index 715328ce0..4322605fa 100644
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -2510,21 +2510,21 @@ void GEOM_Gen_i::LoadPlugin(const std::string& theLibName)
 
   // check, if corresponding operations are already created
   if (myOpCreatorMap.find(theLibName) == myOpCreatorMap.end()) {
-#ifdef UNICODE
-	  //RNV: this is workaround for providing compilation,
-	  //     path should be processed as unicode string.
-	  size_t length = strlen(aPlatformLibName.c_str()) + sizeof(char);
-	  wchar_t* aPath = new wchar_t[length + 1];
-	  memset(aPath, '\0', length);
-	  mbstowcs(aPath, aPlatformLibName.c_str(), length);
-#else
-	  const char* aPath = xmlPath.c_str();
-#endif
-    // load plugin library
 #if WIN32
+  #if UNICODE
+    //RNV: this is workaround for providing compilation,
+    //     path should be processed as unicode string.
+    size_t length = strlen(aPlatformLibName.c_str()) + sizeof(char);
+    wchar_t* aPath = new wchar_t[length + 1];
+    memset(aPath, '\0', length);
+    mbstowcs(aPath, aPlatformLibName.c_str(), length);
+  #else
+    const char* aPath = aPlatformLibName.c_str();
+  #endif
+    // load plugin library
     LibHandle libHandle = LoadLib(aPath);
 #else
-	LibHandle libHandle = LoadLib(aPlatformLibName.c_str());
+    LibHandle libHandle = LoadLib(aPlatformLibName.c_str());
 #endif
     if (!libHandle) {
       // report any error, if occurred