*** empty log message ***

6 files changed, 55 insertions, 13 deletions

diff --git a/ChangeLog-97a b/ChangeLog-97a
index c90fadf313d..a82a40b166c 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,3 +1,9 @@
+Thu Mar 20 05:23:26 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/OS.h: Moved the ACE_LACKS_SIGACTION block so that it will
+ 	  work on Win32.  Thanks to Matthias Kerkhoff
+ 	  <make@cs.tu-berlin.de> for pointing this out.
+
 Thu Mar 20 01:13:19 1997    <harrison@samba.cs.wustl.edu>
 
 	* ace/High_Res_Timer.{cpp,i}: By default, High_Res_Timer is
diff --git a/ace/Connector.h b/ace/Connector.h
index 0a2470ac05f..b785224ec86 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-
 // ============================================================================
 //
 // = LIBRARY
@@ -29,7 +28,7 @@
 #define ACE_PEER_CONNECTOR_1 class PEER_CONNECTOR
 #define ACE_PEER_CONNECTOR_2 PEER_CONNECTOR
 #define ACE_PEER_CONNECTOR PEER_CONNECTOR
-#define ACE_PEER_CONNECTOR_ADDR PEER_CONNECTOR::PEER_ADDR
+#define ACE_PEER_CONNECTOR_ADDR ACE_TYPENAME PEER_CONNECTOR::PEER_ADDR
 #else
 #define ACE_PEER_CONNECTOR_1 class PEER_CONNECTOR, class PEER_ADDR
 #define ACE_PEER_CONNECTOR_2 PEER_CONNECTOR, PEER_ADDR
@@ -118,7 +117,7 @@ class ACE_Connector : public ACE_Service_Object
 public:
   // = Initialization and termination methods.
 
-  typedef ACE_TYPENAME ACE_PEER_CONNECTOR_ADDR PEER_ADDR;
+  // typedef ACE_TYPENAME ACE_PEER_CONNECTOR_ADDR PEER_ADDR;
 
   ACE_Connector (ACE_Reactor *r = ACE_Service_Config::reactor ());
   // Initialize a connector.
diff --git a/ace/OS.h b/ace/OS.h
index 1fc85dcacef..941f557a0ef 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -194,15 +194,6 @@ typedef int key_t;
 // configuration file (e.g., config-sunos5-sunc++-4.x.h).  
 #include "ace/config.h"
 
-#if defined (ACE_LACKS_SIGACTION)
-struct sigaction 
-{
-  int sa_flags;
-  ACE_SignalHandlerV sa_handler;
-  sigset_t sa_mask;
-};
-#endif /* ACE_LACKS_SIGACTION */
-
 #if defined (ACE_HAS_CHARPTR_SPRINTF)
 #define ACE_SPRINTF_ADAPTER(X) ::strlen (X)
 #else
@@ -1987,6 +1978,15 @@ typedef fd_set ACE_FD_SET_TYPE;
 #endif /* FILENAME_MAX */
 #endif /* MAXNAMELEN */
 
+#if defined (ACE_LACKS_SIGACTION)
+struct sigaction 
+{
+  int sa_flags;
+  ACE_SignalHandlerV sa_handler;
+  sigset_t sa_mask;
+};
+#endif /* ACE_LACKS_SIGACTION */
+
 // This one exists only to please Service_Config.h and
 // Service_Manager.cpp
 #if !defined (SIGHUP)
diff --git a/examples/Connection/non_blocking/CPP-acceptor.cpp b/examples/Connection/non_blocking/CPP-acceptor.cpp
index a6494e73804..2ce9df111b4 100644
--- a/examples/Connection/non_blocking/CPP-acceptor.cpp
+++ b/examples/Connection/non_blocking/CPP-acceptor.cpp
@@ -3,7 +3,6 @@
 
 #define CPP_ACCEPTOR_C
 
-
 #include "ace/Service_Config.h"
 #include "CPP-acceptor.h"
 
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
new file mode 100644
index 00000000000..eb1a899eb47
--- /dev/null
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -0,0 +1,19 @@
+CC		= /bin/cc
+CXX		= /opt/aCC/bin/aCC
+DLD		= $(CXX)
+LD		= $(CXX) 
+PIC		= +Z
+ARFLAGS		= ruv
+RANLIB		= echo
+CFLAGS		= $(DCFLAGS) 
+LDFLAGS		= -L$(WRAPPER_ROOT)/ace -Wl,+s
+LIBS		+= -lxti
+CCFLAGS		= 
+SOFLAGS		= -b
+SOEXT		= sl
+SHLIBBUILD 	= $(SOLINK.cc) -o $@ $(VSHOBJS1)
+SOBUILD     = @echo ""; \
+  echo "$(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<"; \
+  $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+  echo "$(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o"; \
+  $(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU
new file mode 100644
index 00000000000..2d2cfd228f5
--- /dev/null
+++ b/include/makeinclude/platform_hpux_gcc.GNU
@@ -0,0 +1,19 @@
+CC		= gcc -w
+CXX		= g++ -w -I.
+DLD		= $(CXX)
+LD		= $(CXX)
+PIC		= -fPIC
+ARFLAGS		= ruv
+RANLIB		= echo
+CFLAGS		= $(DCFLAGS) 
+LDFLAGS		= -L$(WRAPPER_ROOT)/ace -Wl,+s
+LIBS		+= -lxti
+CCFLAGS		= 
+SOFLAGS		= $(CPPFLAGS) -shared -nostdlib
+SOEXT		= sl
+SOBUILD 	= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+SHLIBBUILD 	= $(SOLINK.cc) -o $@ $(VSHOBJS1)
+PRELIB = (echo "main() { }" > gcctemp.c && \
+          $(COMPILE.cc) $(PIC) -o gcctemp.o gcctemp.c && \
+          $(LINK.cc) -o gcctemp gcctemp.o $^ $(LDFLAGS) $(LIBS); \
+          status=$$?; exit $$status)