diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-09-04 08:58:29 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-09-04 08:58:29 +0000 |
| commit | e54670c2aa4353272ebb43a5134d01ec85e3aeb4 (patch) | |
| tree | ba525a9087ec05180ef64efcc6a6f83a32a82a3d | |
| parent | 72268260f27210d006d032cd8efd5b7c77f6a2e1 (diff) | |
| download | ATCD-e54670c2aa4353272ebb43a5134d01ec85e3aeb4.tar.gz | |
Thu Sep 4 09:00:56 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* apps/JAWS3/contrib/john_at_lyris_dot_com/jaws3-cntlC.code:
* examples/NT_Service/main.cpp:
Corrected control handler function signature
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/jaws3-cntlC.code | 2 | ||||
| -rw-r--r-- | ACE/examples/NT_Service/main.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d06d98e715f..b7c2fc28a64 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 4 09:00:56 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * apps/JAWS3/contrib/john_at_lyris_dot_com/jaws3-cntlC.code: + * examples/NT_Service/main.cpp: + Corrected control handler function signature + Thu Sep 4 08:57:02 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * ace/os_include/os_stropts.h: diff --git a/ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/jaws3-cntlC.code b/ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/jaws3-cntlC.code index df2a69d2bc0..f87032378e5 100644 --- a/ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/jaws3-cntlC.code +++ b/ACE/apps/JAWS3/contrib/john_at_lyris_dot_com/jaws3-cntlC.code @@ -17,7 +17,7 @@ bool PlatformSpecificInitialize() { return lyris_success; }; -BOOL WINAPI handler_routine(DWORD signal) { +BOOL handler_routine(DWORD signal) { LYRIS_PROFILE("handler_routine"); diff --git a/ACE/examples/NT_Service/main.cpp b/ACE/examples/NT_Service/main.cpp index 4571c51be0c..5a509177ec4 100644 --- a/ACE/examples/NT_Service/main.cpp +++ b/ACE/examples/NT_Service/main.cpp @@ -142,7 +142,7 @@ Process::parse_args (int argc, ACE_TCHAR* argv[]) // Define a function to handle Ctrl+C to cleanly shut this down. -static BOOL WINAPI +static BOOL ConsoleHandler (DWORD /*ctrlType*/) { SERVICE::instance ()->handle_control (SERVICE_CONTROL_STOP); |