summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2003-03-06 23:15:17 +0000
committerSteve Huston <shuston@riverace.com>2003-03-06 23:15:17 +0000
commit210f587c3f413a0fd24480b82b1649ce2ddef5c9 (patch)
tree6d90871f3df34fe6b0b7ecc778de1c0db6474dc2
parente033aa14a4cff3c39fcf71f7681e26f363686e1e (diff)
downloadATCD-210f587c3f413a0fd24480b82b1649ce2ddef5c9.tar.gz
ChangeLogTag:Thu Mar 6 18:14:21 2003 Steve Huston <shuston@riverace.com>
-rw-r--r--examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp7
-rw-r--r--include/makeinclude/platform_hpux_aCC.GNU5
2 files changed, 10 insertions, 2 deletions
diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
index 813e88d1314..419aaf6c0b1 100644
--- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
@@ -145,8 +145,15 @@ int
Process_Per_Connection_Logging_Server::run_worker (int, char *argv[])
{
int client_handle_i = atoi (argv[2]);
+ // Some compilers don't like reinterpret_casting an int to an int, so
+ // only do reinterpret_cast on Windows.
+#if defined (ACE_WIN32)
ACE_HANDLE client_handle =
ACE_reinterpret_cast (ACE_HANDLE, client_handle_i);
+#else
+ ACE_HANDLE client_handle =
+ ACE_static_cast (ACE_HANDLE, client_handle_i);
+#endif /* ACE_WIN32 */
ACE_SOCK_Stream client (client_handle);
handle_data (&client);
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 052f42203f8..47316766a91 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -117,11 +117,12 @@ LD = $(CXX)
OCCFLAGS = -O
PIC = +Z
-AR = $(COMPILE.cc) +inst_close $^; /bin/ar
+PRELIB = $(COMPILE.cc) +inst_close +inst_auto $^
+AR = /usr/ccs/bin/ar
ARFLAGS = ruv
RANLIB = echo
LDFLAGS = -Wl,+s -z
-SOFLAGS += -b
+SOFLAGS += -b +inst_none
ifeq ($(distrib),1)