matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get GetUserName out of the way on Windows

Browse Source
This commit is contained in:
Tamás Bálint Misius 2019-04-17 01:13:54 +02:00
parent 2e76b10619
commit 5810a19dbc
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/SaveInfo.h
View File

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

4
src/gui/game/GameController.cpp
View File

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

3
src/gui/game/GameView.cpp
View File

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

4
src/gui/preview/PreviewView.cpp
View File

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

4
src/gui/search/SearchView.cpp
View File

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