Get GetUserName out of the way on Windows

src/client/SaveInfo.h

@@ -7,6 +7,10 @@
 #include <cstdlib>
 #include <iostream>
 
+#ifdef GetUserName
+# undef GetUserName // dammit windows
+#endif
+
 class GameSave;
 
 class SaveInfo

src/gui/game/GameController.cpp

@@ -39,6 +39,10 @@
 #endif
 #include "lua/LuaEvents.h"
 
+#ifdef GetUserName
+# undef GetUserName // dammit windows
+#endif
+
 using namespace std;
 
 class GameController::SearchCallback: public ControllerCallback

src/gui/game/GameView.cpp

@@ -22,6 +22,9 @@
 #include "simulation/SaveRenderer.h"
 #include "simulation/SimulationData.h"
 
+#ifdef GetUserName
+# undef GetUserName // dammit windows
+#endif
 
 class SplitButton;
 class SplitButtonAction

src/gui/preview/PreviewView.cpp

@@ -17,6 +17,10 @@
 #include "gui/dialogues/ErrorMessage.h"
 #include "common/tpt-rand.h"
 
+#ifdef GetUserName
+# undef GetUserName // dammit windows
+#endif
+
 class PreviewView::LoginAction: public ui::ButtonAction
 {
 	PreviewView * v;

src/gui/search/SearchView.cpp

@@ -11,6 +11,10 @@
 #include "Format.h"
 #include "PowderToy.h"
 
+#ifdef GetUserName
+# undef GetUserName // dammit windows
+#endif
+
 SearchView::SearchView():
 	ui::Window(ui::Point(0, 0), ui::Point(WINDOWW, WINDOWH)),
 	c(NULL),