summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog31
-rw-r--r--ChangeLogs/ChangeLog-02a31
-rw-r--r--ChangeLogs/ChangeLog-03a31
-rw-r--r--apps/Gateway/Peer/Peer.h2
-rw-r--r--apps/JAWS/clients/Blobby/Blob.h2
-rw-r--r--apps/JAWS/clients/Caching/http_handler.h2
-rw-r--r--apps/JAWS/server/Makefile3
-rw-r--r--examples/ASX/Event_Server/Transceiver/transceiver.cpp2
-rw-r--r--examples/Connection/misc/test_upipe.cpp2
-rw-r--r--include/makeinclude/platform_aix_ibm.GNU10
-rw-r--r--include/makeinclude/rules.lib.GNU1
11 files changed, 106 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index a5af4eeb96b..01b0cc7b0d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,33 @@
-Wed Jun 20 17:31:32 2001 Jeff Parsons <parsons@cs.wustl.edu>
+Thu Jun 21 08:00:01 2001 Chad Elliott <elliott_c@ociweb.com>
+
+ * apps/Gateway/Peer/Peer.h:
+ * apps/JAWS/clients/Blobby/Blob.h:
+ * apps/JAWS/clients/Caching/http_handler.h:
+ * examples/ASX/Event_Server/Transceiver/transceiver.cpp:
+ * examples/Connection/misc/test_upipe.cpp:
+
+ Moved #include "ace/Connector.h" to be after #include
+ "ace/SOCK_Connector.h" to fix compile error on AIX, Visual
+ Age C++ 5.
+
+ * apps/JAWS/server/Makefile:
+
+ Move include of wrapper_macros.GNU below the check of the
+ ACE_BUILD_COMPONENTS to avoid a warning about overriding commands
+ for target libJAWS.a for AIX, Visual Age C++, 5.
+
+ * include/makeinclude/platform_aix_ibm.GNU:
+
+ Added warning suppression for possible use of uninitialized
+ variables and possible infinite loops. Added support for 64 bit
+ builds with Visual Age C++ 5.
+
+ * include/makeinclude/rules.lib.GNU:
+
+ Fixed shared lib making rule. Remove shr.o after building the lib
+ to make sure subsequent builds are correct.
+
+Wed Jun 20 17:31:32 2001 Jeff Parsons <parsons@cs.wustl.edu>
* ace/CDR_Base.cpp:
* ace/CDR_Base.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a5af4eeb96b..01b0cc7b0d8 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,4 +1,33 @@
-Wed Jun 20 17:31:32 2001 Jeff Parsons <parsons@cs.wustl.edu>
+Thu Jun 21 08:00:01 2001 Chad Elliott <elliott_c@ociweb.com>
+
+ * apps/Gateway/Peer/Peer.h:
+ * apps/JAWS/clients/Blobby/Blob.h:
+ * apps/JAWS/clients/Caching/http_handler.h:
+ * examples/ASX/Event_Server/Transceiver/transceiver.cpp:
+ * examples/Connection/misc/test_upipe.cpp:
+
+ Moved #include "ace/Connector.h" to be after #include
+ "ace/SOCK_Connector.h" to fix compile error on AIX, Visual
+ Age C++ 5.
+
+ * apps/JAWS/server/Makefile:
+
+ Move include of wrapper_macros.GNU below the check of the
+ ACE_BUILD_COMPONENTS to avoid a warning about overriding commands
+ for target libJAWS.a for AIX, Visual Age C++, 5.
+
+ * include/makeinclude/platform_aix_ibm.GNU:
+
+ Added warning suppression for possible use of uninitialized
+ variables and possible infinite loops. Added support for 64 bit
+ builds with Visual Age C++ 5.
+
+ * include/makeinclude/rules.lib.GNU:
+
+ Fixed shared lib making rule. Remove shr.o after building the lib
+ to make sure subsequent builds are correct.
+
+Wed Jun 20 17:31:32 2001 Jeff Parsons <parsons@cs.wustl.edu>
* ace/CDR_Base.cpp:
* ace/CDR_Base.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a5af4eeb96b..01b0cc7b0d8 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,4 +1,33 @@
-Wed Jun 20 17:31:32 2001 Jeff Parsons <parsons@cs.wustl.edu>
+Thu Jun 21 08:00:01 2001 Chad Elliott <elliott_c@ociweb.com>
+
+ * apps/Gateway/Peer/Peer.h:
+ * apps/JAWS/clients/Blobby/Blob.h:
+ * apps/JAWS/clients/Caching/http_handler.h:
+ * examples/ASX/Event_Server/Transceiver/transceiver.cpp:
+ * examples/Connection/misc/test_upipe.cpp:
+
+ Moved #include "ace/Connector.h" to be after #include
+ "ace/SOCK_Connector.h" to fix compile error on AIX, Visual
+ Age C++ 5.
+
+ * apps/JAWS/server/Makefile:
+
+ Move include of wrapper_macros.GNU below the check of the
+ ACE_BUILD_COMPONENTS to avoid a warning about overriding commands
+ for target libJAWS.a for AIX, Visual Age C++, 5.
+
+ * include/makeinclude/platform_aix_ibm.GNU:
+
+ Added warning suppression for possible use of uninitialized
+ variables and possible infinite loops. Added support for 64 bit
+ builds with Visual Age C++ 5.
+
+ * include/makeinclude/rules.lib.GNU:
+
+ Fixed shared lib making rule. Remove shr.o after building the lib
+ to make sure subsequent builds are correct.
+
+Wed Jun 20 17:31:32 2001 Jeff Parsons <parsons@cs.wustl.edu>
* ace/CDR_Base.cpp:
* ace/CDR_Base.h:
diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h
index 78cac65fa4a..f34b14d8aea 100644
--- a/apps/Gateway/Peer/Peer.h
+++ b/apps/Gateway/Peer/Peer.h
@@ -55,9 +55,9 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/Acceptor.h"
-#include "ace/Connector.h"
#include "ace/SOCK_Acceptor.h"
#include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
#include "Options.h"
ACE_SVC_FACTORY_DECLARE (Peer_Factory)
diff --git a/apps/JAWS/clients/Blobby/Blob.h b/apps/JAWS/clients/Blobby/Blob.h
index 421d4ba8a1d..4fe63c8da9f 100644
--- a/apps/JAWS/clients/Blobby/Blob.h
+++ b/apps/JAWS/clients/Blobby/Blob.h
@@ -27,10 +27,10 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/Connector.h"
#include "ace/INET_Addr.h"
#include "ace/Svc_Handler.h"
#include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
#include "ace/Message_Block.h"
#include "Blob_Handler.h"
diff --git a/apps/JAWS/clients/Caching/http_handler.h b/apps/JAWS/clients/Caching/http_handler.h
index ec736312c0e..c808a15e4f0 100644
--- a/apps/JAWS/clients/Caching/http_handler.h
+++ b/apps/JAWS/clients/Caching/http_handler.h
@@ -15,13 +15,13 @@
//
// ============================================================================
-#include "ace/Connector.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
class HTTP_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
// = TITLE
diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile
index 1b2b8dfbfd9..2eb095a8c49 100644
--- a/apps/JAWS/server/Makefile
+++ b/apps/JAWS/server/Makefile
@@ -35,8 +35,6 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
# Include macros and targets
#----------------------------------------------------------------------------
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
#### If the ACE library wasn't built with sufficient components, don't
#### try to build here.
ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
@@ -48,6 +46,7 @@ ifeq (Utils,$(findstring Utils,$(ACE_BUILD_COMPONENTS)))
endif # ! FOR_TAO
endif # ! Utils
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 4576c1c0595..d2d753f4b18 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -5,8 +5,8 @@
// program by typing ^C....
#include "ace/Service_Config.h"
-#include "ace/Connector.h"
#include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
#include "ace/Get_Opt.h"
#include "transceiver.h"
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index 8775512c8ad..29d414f4d06 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -6,9 +6,9 @@
// ACE_UPIPEs.
#include "ace/Acceptor.h"
-#include "ace/Connector.h"
#include "ace/UPIPE_Acceptor.h"
#include "ace/UPIPE_Connector.h"
+#include "ace/Connector.h"
#include "ace/UPIPE_Addr.h"
ACE_RCSID(misc, test_upipe, "$Id$")
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
index a2cd0f1ba36..c1c4493beb8 100644
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ b/include/makeinclude/platform_aix_ibm.GNU
@@ -24,6 +24,9 @@ endif
ifeq (,$(threads))
threads = 1
endif
+ifeq (,$(buildbits))
+ buildbits = 32
+endif
# First, find out which compiler we're building with. The settings we
# use for compiling, as well as how to build shared libraries, depend on
@@ -93,9 +96,14 @@ ifeq ($(XLCVERSION),0x0306)
rtti = 0
else
ifeq ($(XLCVERSION),0x0500)
- CCFLAGS += -qflag=w:w
+ CCFLAGS += -qflag=w:w -qsuppress=1540-1102:1500-010
DLD = $(CXX) -qmkshrobj
SOFLAGS = $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS)
+ ifeq ($(buildbits),64)
+ DLD += -q64
+ CCFLAGS += -q64
+ ARFLAGS += -X 64
+ endif
else
CXX = echo "Unrecognized compiler version $(XLCVERSION)\n"
endif
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index ab57d5df40f..8ca819331c5 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -126,6 +126,7 @@ $(VSHLIB): shr.o
ifneq (,$(RANLIB))
-$(RANLIB) $@
endif # RANLIB
+ $(RM) shr.o
shr.o: $(VSHOBJS1)
else
View Lorry Controller Status