summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-28 21:16:36 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-28 21:16:36 +0000
commitd0a411dfea0a746b73cd9b70da158038168c3023 (patch)
tree1f1c365d66aa2416104d7f929a6c70c19dc2790f
parentde88a37ea7a8bea23532fc7ef5776299711378e3 (diff)
downloadATCD-d0a411dfea0a746b73cd9b70da158038168c3023.tar.gz
ChangeLogTag:Wed Jul 28 15:47:20 1999 Irfan Pyarali <irfan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c9
-rw-r--r--TAO/tao/orbconf.h16
2 files changed, 25 insertions, 0 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index f06a8ea54c6..f892beec321 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,12 @@
+Wed Jul 28 15:47:20 1999 Irfan Pyarali <irfan@cs.wustl.edu>
+
+ * tao/orbconf.h: Added new marco ACE_HAS_UIOP. If the user has not
+ already specified TAO_HAS_UIOP, and the platform supports UNIX
+ domain sockets, and minimum CORBA is not defined, we turn on
+ TAO_HAS_UIOP by default. Note that even with minimum CORBA, the
+ user can still get UIOP support simply be defining TAO_HAS_UIOP
+ before reaching this code.
+
Wed Jul 28 14:23:29 1999 Fred Kuhns <fredk@cs.wustl.edu>
* tao/IORManipulation
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 985f8937b42..bb87095c5c1 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -333,6 +333,9 @@
// OBV is in experimental stage
#define TAO_HAS_VALUETYPE
+// UIOP support (GIOP over UNIX domain sockets)
+// #define TAO_HAS_UIOP
+
// Minimum CORBA
// #define TAO_HAS_MINIMUM_CORBA
@@ -368,6 +371,19 @@ and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
#endif /* TAO_HAS_MINIMUM_CORBA */
+// If the user has not already specified TAO_HAS_UIOP, and the
+// platform supports UNIX domain sockets, and minimum CORBA is not
+// defined, we turn on TAO_HAS_UIOP by default. Note that even with
+// minimum CORBA, the user can still get UIOP support simply be
+// defining TAO_HAS_UIOP before reaching this code.
+#if !defined (TAO_HAS_UIOP) && \
+ !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && \
+ !defined (TAO_HAS_MINIMUM_CORBA)
+# define TAO_HAS_UIOP
+#endif /* !TAO_HAS_UIOP &&
+ !ACE_LACKS_UNIX_DOMAIN_SOCKETS &&
+ !TAO_HAS_MINIMUM_CORBA */
+
// Policies are not locality constraint by default.
#if !defined (TAO_HAS_REMOTE_POLICIES)
# define TAO_HAS_REMOTE_POLICIES 1