summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authoroci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-06-21 13:04:07 +0000
committeroci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-06-21 13:04:07 +0000
commit8cd250ce757d217d2f917fe009b9f1bb6a23d188 (patch)
tree177ee39052c67452e372529ef8807ddda1ad9e92 /apps
parentf16c394b209359080c234683bf5b78a1f2b66a1f (diff)
downloadATCD-8cd250ce757d217d2f917fe009b9f1bb6a23d188.tar.gz
ChangeLogTag: Thu Jun 21 08:00:01 2001 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'apps')
-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
4 files changed, 4 insertions, 5 deletions
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