Skip to content

Commit

Permalink
Add #undef main to realmd and mangosd
Browse files Browse the repository at this point in the history
  • Loading branch information
0blu committed Aug 27, 2024
1 parent 78e3370 commit ab442db
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/mangosd/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ uint32 realmID; // Id of the realm
char const* g_mainLogFileName = "Server.log";

// Launch the mangos server
#undef main // TODO Remove me when ACE is removed
extern int main(int argc, char **argv)
{
ServerStartupArguments args;
Expand Down
1 change: 1 addition & 0 deletions src/realmd/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ volatile bool stopEvent = false; // Setting it to true stops the
DatabaseType LoginDatabase; // Accessor to the realm server database

// Launch the realm server
#undef main // TODO Remove me when ACE is removed
extern int main(int argc, char** argv)
{
ServerStartupArguments args;
Expand Down
2 changes: 1 addition & 1 deletion src/shared/ServiceWin32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@


#ifdef main
#undef main
#undef main // TODO Remove me when ACE is removed
#endif

extern int main(int argc, char** argv);
Expand Down

0 comments on commit ab442db

Please sign in to comment.