foo

3 files changed, 20 insertions, 17 deletions

diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
index 39680dd91bc..ee5f39f7efb 100644
--- a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
@@ -1,14 +1,14 @@
-#include "ace/Signal.h"
 // $Id$
 
+#include "ace/Signal.h"
 #include "ace/SV_Message_Queue.h"
 #include "test.h"
 
-/* Must be global for signal Message... */
-ACE_SV_Message_Queue msgque (SRV_KEY, ACE_SV_Message_Queue::ACE_CREATE);
+// Must be global for signal Message...
+static ACE_SV_Message_Queue msgque (SRV_KEY, ACE_SV_Message_Queue::ACE_CREATE);
 
-void
-SIGNAL_handler (int)
+extern "C" void
+handler (int)
 {
   if (msgque.remove () < 0)
     ACE_OS::perror ("msgque.close"), ACE_OS::exit (1);
@@ -23,7 +23,8 @@ main (void)
   ACE_Message_Block send_msg (0, pid, ACE_OS::cuserid (0), 
 			      "I received your message.");
 
-  ACE_Sig_Action sig ((ACE_SignalHandler) SIGNAL_handler, SIGINT);
+  // Register a signal handler.
+  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
 
   for (;;)
     {
diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
index 185c630ad4a..210ffe199c3 100644
--- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
@@ -1,16 +1,16 @@
-#include "ace/Signal.h"
 // $Id$
 
+#include "ace/Signal.h"
 #include "ace/Typed_SV_Message_Queue.h"
 #include "ace/Log_Msg.h"
 #include "test.h"
 
 // Must be global for signal Message...
-ACE_Typed_SV_Message_Queue<Message_Data> msgque 
+static ACE_Typed_SV_Message_Queue<Message_Data> msgque 
   (SRV_KEY, ACE_Typed_SV_Message_Queue<Message_Data>::ACE_CREATE);
 
-void
-SIGNAL_handler (int)
+extern "C" void
+handler (int)
 {
   if (msgque.remove () < 0)
     ACE_ERROR ((LM_ERROR, "%p\n%a", "msgque.recv", 1));
@@ -25,7 +25,8 @@ main (void)
   ACE_Typed_SV_Message<Message_Data> send_msg (msg_data, 0, msg_data.length ());
   ACE_Typed_SV_Message<Message_Data> recv_msg (SRV_ID);
 
-  ACE_Sig_Action sig2 ((ACE_SignalHandler) SIGNAL_handler, SIGINT);
+  // Register a signal handler.
+  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
 
   for (;;)
     {
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
index 3dec989ec52..eda16178483 100644
--- a/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
+++ b/examples/System_V_IPC/SV_Semaphores/Semaphore_Server.cpp
@@ -1,16 +1,16 @@
-#include "ace/Log_Msg.h"
 // $Id$
 
+#include "ace/Log_Msg.h"
 #include "ace/SV_Shared_Memory.h"
 #include "ace/SV_Semaphore_Simple.h"
 #include "ace/Signal.h"
 #include "Semaphore_Test.h"
 
-ACE_SV_Shared_Memory shm_server (SHM_KEY, SHMSZ, ACE_SV_Shared_Memory::ACE_CREATE);
-ACE_SV_Semaphore_Simple sem (SEM_KEY_1, ACE_SV_Semaphore_Simple::ACE_CREATE, 0, 2);
+static ACE_SV_Shared_Memory shm_server (SHM_KEY, SHMSZ, ACE_SV_Shared_Memory::ACE_CREATE);
+static ACE_SV_Semaphore_Simple sem (SEM_KEY_1, ACE_SV_Semaphore_Simple::ACE_CREATE, 0, 2);
 
-static void 
-cleanup (int = 0)
+extern "C" void 
+cleanup (int)
 {
   if (shm_server.remove () < 0 || sem.remove () < 0)
     ACE_ERROR ((LM_ERROR, "%p\n%a", "remove", 1));
@@ -20,7 +20,8 @@ cleanup (int = 0)
 int
 main (void)
 {
-  ACE_Sig_Action sig ((ACE_SignalHandler) cleanup, SIGINT);
+  // Register a signal handler.
+  ACE_Sig_Action sa ((ACE_SignalHandler) cleanup, SIGINT);
 
   char *s = (char *) shm_server.get_segment_ptr ();