From 14014bc61aed5f19893f33b8ac030cdf107275d0 Mon Sep 17 00:00:00 2001
From: balazs-bamer <kolaloka@freemail.hu>
Date: Wed, 24 Dec 2014 10:06:18 +0100
Subject: [PATCH] Fix build failures on Windows by WMayer

Patch request from WMayer to fix build failures on Windows.
---
 src/Mod/Surface/App/FeatureCut.cpp     |  4 +---
 src/Mod/Surface/App/FeatureFilling.cpp |  4 ----
 src/Mod/Surface/App/FeatureSewing.cpp  |  5 +----
 src/Mod/Surface/Gui/AppSurfaceGui.cpp  |  2 +-
 src/Mod/Surface/Gui/PreCompiled.h      | 19 ++++++-------------
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/Mod/Surface/App/FeatureCut.cpp b/src/Mod/Surface/App/FeatureCut.cpp
index 5443964887..ba4d8217c5 100644
--- a/src/Mod/Surface/App/FeatureCut.cpp
+++ b/src/Mod/Surface/App/FeatureCut.cpp
@@ -63,8 +63,6 @@ App::DocumentObjectExecReturn *Cut::execute(void)
 
     //Perform error checking
 
-    bool res;
-
     //Begin Construction
     try{
 
@@ -109,7 +107,7 @@ App::DocumentObjectExecReturn *Cut::execute(void)
             return new App::DocumentObjectExecReturn("Resulting shape is null");
         }
         this->Shape.setValue(aCutShape);
-
+        return 0;
     } //End Try
     catch (Standard_Failure) {
         Handle_Standard_Failure e = Standard_Failure::Caught();
diff --git a/src/Mod/Surface/App/FeatureFilling.cpp b/src/Mod/Surface/App/FeatureFilling.cpp
index 6324692cd2..4bdea4619f 100644
--- a/src/Mod/Surface/App/FeatureFilling.cpp
+++ b/src/Mod/Surface/App/FeatureFilling.cpp
@@ -122,8 +122,6 @@ App::DocumentObjectExecReturn *Filling::execute(void)
     unsigned int Mdeg = MaxDeg.getValue();
     unsigned int Mseg = MaxSegments.getValue();
 
-    bool res;
-
     //Perform error checking
 
 
@@ -427,8 +425,6 @@ void appconstr_pt(BRepFill_Filling& builder,const App::PropertyLinkSubList& aVer
 
 void appinitface(BRepFill_Filling& builder,const App::PropertyLinkSubList& aFace){
 
-    int res;
-
     if(aFace.getSize()>1){Standard_Failure::Raise("Only one face may be used for the initial face");return;}
 
     Part::TopoShape ts;
diff --git a/src/Mod/Surface/App/FeatureSewing.cpp b/src/Mod/Surface/App/FeatureSewing.cpp
index 63c06b916b..dedec4f475 100644
--- a/src/Mod/Surface/App/FeatureSewing.cpp
+++ b/src/Mod/Surface/App/FeatureSewing.cpp
@@ -91,8 +91,6 @@ App::DocumentObjectExecReturn *Sewing::execute(void)
     //Perform error checking
 
 
-    bool res;
-
     //Begin Construction
     try{
 
@@ -113,8 +111,7 @@ App::DocumentObjectExecReturn *Sewing::execute(void)
         if (aShape.IsNull())
             return new App::DocumentObjectExecReturn("Resulting shape is null");
         this->Shape.setValue(aShape);
-
-
+        return 0;
     } //End Try
     catch (Standard_Failure) {
         Handle_Standard_Failure e = Standard_Failure::Caught();
diff --git a/src/Mod/Surface/Gui/AppSurfaceGui.cpp b/src/Mod/Surface/Gui/AppSurfaceGui.cpp
index b647a86ae4..e0da6de29b 100644
--- a/src/Mod/Surface/Gui/AppSurfaceGui.cpp
+++ b/src/Mod/Surface/Gui/AppSurfaceGui.cpp
@@ -47,7 +47,7 @@ PyDoc_STRVAR(module_SurfaceGui_doc,
 
 /* Python entry */
 extern "C" {
-void PartGuiExport initSurfaceGui()
+void SurfaceGuiExport initSurfaceGui()
 {
     if (!Gui::Application::Instance) {
         PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");
diff --git a/src/Mod/Surface/Gui/PreCompiled.h b/src/Mod/Surface/Gui/PreCompiled.h
index 79de562fb8..99b0d61bc5 100644
--- a/src/Mod/Surface/Gui/PreCompiled.h
+++ b/src/Mod/Surface/Gui/PreCompiled.h
@@ -24,26 +24,19 @@
 #ifndef GUI_PRECOMPILED_H
 #define GUI_PRECOMPILED_H
 
-/*#include <FCConfig.h>
-
-// Importing of App classes
-#ifdef FC_OS_WIN32
-# define SurfaceAppExport __declspec(dllimport)
-# define SurfaceGuiExport __declspec(dllexport)
-#else // for Linux
-# define SurfaceAppExport
-# define SurfaceGuiExport
-#endif*/
-
 #include <FCConfig.h>
 
 // Importing of App classes
 #ifdef FC_OS_WIN32
 # define PartExport           __declspec(dllimport)
 # define PartGuiExport        __declspec(dllimport)
+# define SurfaceAppExport     __declspec(dllimport)
+# define SurfaceGuiExport     __declspec(dllexport)
 #else // for Linux
-# define PartExport     
-# define PartGuiExport     
+# define PartExport
+# define PartGuiExport
+# define SurfaceAppExport
+# define SurfaceGuiExport
 #endif
 
 #ifdef _PreComp_