From: vsr <vsr@opencascade.com>
Date: Tue, 1 Nov 2011 06:52:42 +0000 (+0000)
Subject: Integrate missing patch for Windows compatibility (merge from V6_3_BR)
X-Git-Tag: RELIQUAT_6x_15112011~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=54f772802e27305b9d85850160f0f90d5c0ae352;p=modules%2Fjobmanager.git

Integrate missing patch for Windows compatibility (merge from V6_3_BR)
---

diff --git a/src/genericgui/BL_GenericGui.cxx b/src/genericgui/BL_GenericGui.cxx
index c886178..9fd175f 100644
--- a/src/genericgui/BL_GenericGui.cxx
+++ b/src/genericgui/BL_GenericGui.cxx
@@ -19,6 +19,10 @@
 
 #include "BL_GenericGui.hxx"
 
+#ifdef WNT
+#undef ERROR
+#endif
+
 BL::GenericGui::GenericGui(BL::MainWindows_Wrap * wrapper) : QObject(wrapper->getDockParent())
 {
   DEBTRACE("Creating BL::GenericGui");