Merge branch 'V9_2_BR'

[modules/kernel.git] / src / SALOMEDSImpl / SALOMEDSImpl_Tool.hxx

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
index cf3999f14bf3a722954325322d77dbd5c7038836..9a58128492a6cff89c1332d4cba2b1a5aad3975c 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -35,6 +35,10 @@
 #include <vector>
 #include "DF_Label.hxx"
 
+#ifdef WIN32
+# undef GetUserName
+#endif
+
 class SALOMEDSIMPL_EXPORT SALOMEDSImpl_Tool
 {