diff options
Diffstat (limited to 'src/server/shared/Utilities/ServiceWin32.cpp')
| -rw-r--r-- | src/server/shared/Utilities/ServiceWin32.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp index 2c1df2ff483..a50a4f9d039 100644 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef WIN32 +#ifdef _WIN32 #include "Common.h" #include "Log.h" @@ -26,6 +26,11 @@ #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 |