diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
| commit | 6568b0624dcd03243c70f9aa905b88422cb1e4c2 (patch) | |
| tree | 48ec6babfbfb2f9d255df568b659db9541d11054 /dep/acelite/ace/NT_Service.h | |
| parent | e3add09fb7f8f3c425f6cb0e7611e4e2381bf88d (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'dep/acelite/ace/NT_Service.h')
| -rw-r--r-- | dep/acelite/ace/NT_Service.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dep/acelite/ace/NT_Service.h b/dep/acelite/ace/NT_Service.h index 0e1e0a16a84..f602021e418 100644 --- a/dep/acelite/ace/NT_Service.h +++ b/dep/acelite/ace/NT_Service.h @@ -4,7 +4,7 @@ /** * @file NT_Service.h * - * $Id: NT_Service.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: NT_Service.h 93117 2011-01-20 12:11:28Z mcorino $ * * @author Steve Huston <shuston@riverace.com> */ @@ -415,7 +415,8 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ ACE_TCHAR **lpszArgv); #define ACE_NT_SERVICE_ENTRY(SVCDESC, SVCNAME) \ - { SVCDESC, &ace_nt_svc_main_##SVCNAME } + { const_cast<ACE_TCHAR*> (SVCDESC), \ + &ace_nt_svc_main_##SVCNAME } #define ACE_NT_SERVICE_RUN(SVCNAME, SVCINSTANCE, RET) \ ACE_TEXT_SERVICE_TABLE_ENTRY _ace_nt_svc_table[2] = \ |