Merge in changes from HP-UX 11 port

5 files changed, 8 insertions, 8 deletions

diff --git a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
index 42035bb326e..57eea6d6b30 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
@@ -10,10 +10,10 @@ main (int argc, char *argv[])
   // Initialize WinSock DLL on Win32...
   ACE_OS::socket_init (ACE_WSOCK_VERSION);
 
-  struct sockaddr_in saddr;
-  struct hostent *hp;
-  char *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
-  u_short port_num =
+  struct sockaddr_in saddr;                                          
+  struct hostent *hp;                                           
+  const char *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
+  u_short port_num = 
     htons (argc > 2 ? atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT);
   int sockbufsize = argc > 3 ? ACE_OS::atoi (argv[3]) : 0;
   char buf[BUFSIZ];
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp
index f09de4ad760..2bad13ea9bd 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp
@@ -8,7 +8,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/INET_Addr.h"                                       
 
-#if defined (ACE_HAS_SVR4_POLL)
+#if defined (ACE_HAS_POLL)
 
 // Maximum per-process open I/O descriptors.
 const int MAX_FDS = 200;
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp
index bfc8a0bf5ea..3be6a222964 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp
@@ -10,7 +10,7 @@
 int 
 main (int argc, char *argv[])                       
 {                                                       
-  char *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
+  const char *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
   char buf[BUFSIZ];
 
   ACE_LSOCK_Stream cli_stream;
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
index c733a018312..aac6654c9a7 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
@@ -11,7 +11,7 @@
 int 
 main (int argc, char *argv[])
 {                                                                
-  char *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
+  const char *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
 
   // Create a server address.
   ACE_UNIX_Addr server_addr (rendezvous);
diff --git a/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
index afcb55f33ad..378d50b7393 100644
--- a/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp
@@ -45,7 +45,7 @@ handle_client (ACE_LSOCK_Stream &stream)
 int 
 main (int argc, char *argv[])
 {                                                                
-  char *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
+  const char *rendezvous = argc > 1 ? argv[1] : ACE_DEFAULT_RENDEZVOUS;
   // Create a server.
   ACE_OS::unlink (rendezvous);
   ACE_UNIX_Addr addr (rendezvous);