summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2014-09-04 16:39:33 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2014-09-04 16:39:33 +0000
commitc02f3ad25d2e90d782b4a54f1bcaf1eca1b24bc1 (patch)
tree3e4354b3ccc291078392a3311108532cc6827686 /TAO
parent04301d602bed6aad352d67e5efa536169e8d4c2d (diff)
downloadATCD-c02f3ad25d2e90d782b4a54f1bcaf1eca1b24bc1.tar.gz
Thu Sep 4 16:42:08 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/Naming_Service/NT_Naming_Server.cpp: * orbsvcs/Notify_Service/NT_Notify_Server.cpp: Another attempt to fix the control handler function signature
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp2
-rw-r--r--TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp2
3 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4052bf60be2..e84bb7d0648 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 4 16:42:08 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/Naming_Service/NT_Naming_Server.cpp:
+ * orbsvcs/Notify_Service/NT_Notify_Server.cpp:
+ Another attempt to fix the control handler function signature
+
Thu Sep 4 09:01:40 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/Naming_Service/NT_Naming_Server.cpp:
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index 210ebb92ea4..e3baa1caba8 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -172,7 +172,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
// Define a function to handle Ctrl+C to cleanly shut this down.
-static BOOL
+static BOOL WINAPI
ConsoleHandler (DWORD /* ctrlType */)
{
SERVICE::instance ()->handle_control (SERVICE_CONTROL_STOP);
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index e26be59465e..d648f6abf3f 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -175,7 +175,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
}
// Define a function to handle Ctrl+C to cleanly shut this down.
-static BOOL
+static BOOL WINAPI
ConsoleHandler (DWORD /* ctrlType */)
{
SERVICE::instance ()->handle_control (SERVICE_CONTROL_STOP);