summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-01-02 02:00:01 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-01-02 02:00:01 +0000
commit4116caaa58e92f63b58c64e1048ea0a67bb0f3a6 (patch)
tree76ce96bb12c4ad70a7de4adf3c2f87014c893800
parent5ae19e59a33cc52a244fa2c2e861dd3e3a2392f7 (diff)
downloadATCD-4116caaa58e92f63b58c64e1048ea0a67bb0f3a6.tar.gz
*** empty log message ***
-rw-r--r--apps/Gateway/Gateway/Makefile6
-rw-r--r--apps/Gateway/Gateway/Options.cpp2
-rw-r--r--apps/Gateway/Gateway/svc.conf2
3 files changed, 7 insertions, 3 deletions
diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile
index 8351d519d9d..69fbbffa941 100644
--- a/apps/Gateway/Gateway/Makefile
+++ b/apps/Gateway/Gateway/Makefile
@@ -31,7 +31,11 @@ LDLIBS = -lGateway
VLDLIBS = $(LDLIBS:%=%$(VAR))
-BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
+#### Build the ACE shared library _before_ the static library.
+#### This works around an apparent problem with template
+#### instantiation with Sun C++ 4.1 and 4.2 (the symptom is link
+#### error due to ACE_TimeValue::normalize () not being found).
+BUILD = $(VSHLIB) $(SHLIBA) $(VLIB) $(VBIN)
#----------------------------------------------------------------------------
# Include macros and targets
diff --git a/apps/Gateway/Gateway/Options.cpp b/apps/Gateway/Gateway/Options.cpp
index 239a5805e82..e588140e7a9 100644
--- a/apps/Gateway/Gateway/Options.cpp
+++ b/apps/Gateway/Gateway/Options.cpp
@@ -122,7 +122,7 @@ int
Options::parse_args (int argc, char *argv[])
{
// Assign defaults.
- ACE_Get_Opt get_opt (argc, argv, "abC:cdP:p:q:t:vw:", 0);
+ ACE_Get_Opt get_opt (argc, argv, "a:bC:c:dP:p:q:t:vw:", 0);
for (int c; (c = get_opt ()) != EOF; )
{
diff --git a/apps/Gateway/Gateway/svc.conf b/apps/Gateway/Gateway/svc.conf
index 89a6209e641..0a845c02ce6 100644
--- a/apps/Gateway/Gateway/svc.conf
+++ b/apps/Gateway/Gateway/svc.conf
@@ -1,3 +1,3 @@
#static Svc_Manager "-d -p 2913"
-dynamic Gateway Service_Object * ./Gateway:_make_Gateway() active "-b -d -c:10000 -P proxy_config -C consumer_config"
+dynamic Gateway Service_Object * ./Gateway:_make_Gateway() active "-b -d -c C:10000 -P proxy_config -C consumer_config"