diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
| commit | 01d9681a4d75be566f359f54fc37173b043befdf (patch) | |
| tree | da097e38d1c4f7b71b929ba6477156d5b5da3171 /src/server/shared/Utilities/ServiceWin32.cpp | |
| parent | 4f6db255a23b8d321bea2265295fd09ba3095833 (diff) | |
| parent | 44c0d66d63f58a022045efbb6cff6e1278f6a8cb (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/authserver/Realms/RealmList.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
Diffstat (limited to 'src/server/shared/Utilities/ServiceWin32.cpp')
| -rw-r--r-- | src/server/shared/Utilities/ServiceWin32.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp index f4a0339d9e6..ecf403423f7 100644 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -24,11 +24,6 @@ #include <windows.h> #include <winsvc.h> -// stupid ACE define -#ifdef main -#undef main -#endif //main - #if !defined(WINADVAPI) #if !defined(_ADVAPI32_) #define WINADVAPI DECLSPEC_IMPORT |