ChangeLogTag:Thu Oct 30 23:23:05 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

5 files changed, 18 insertions, 11 deletions

diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
index 386c5e4f333..29f3b80c1f6 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -9,7 +9,6 @@
 
 ACE_RCSID(tao, Asynch_Timeout_Handler, "$Id$")
 
-#if (TAO_HAS_AMI_CALLBACK == 1)
 
 TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler (
   TAO_Asynch_Reply_Dispatcher_Base *rd,
@@ -67,4 +66,3 @@ TAO_Asynch_Timeout_Handler::cancel ()
     }
 }
 
-#endif /* (TAO_HAS_AMI_CALLBACK == 1) */
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
index 881e65e8114..be230bb6374 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
@@ -28,8 +28,6 @@
 #include "tao/orbconf.h"
 #include "tao/Basic_Types.h"
 
-#if (TAO_HAS_AMI_CALLBACK == 1)
-
 #include "ace/Event_Handler.h"
 
 class TAO_Asynch_Reply_Dispatcher_Base;
@@ -75,8 +73,6 @@ public:
   ACE_Reactor *reactor_;
 };
 
-#endif /* (TAO_HAS_AMI_CALLBACK == 1)*/
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ASYNCH_TIMEOUT_HANDLER_H */
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index 47ead2e29b5..b0877afef53 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -64,7 +64,6 @@ TAO_Messaging_Initializer::init (void)
   return 0;
 }
 
-#if (TAO_HAS_AMI_CALLBACK == 1)
 
 void TAO_Messaging_Helper::
 exception_holder_raise (TAO::Exception_Data *exception_data,
@@ -156,4 +155,3 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
                              CORBA::COMPLETED_YES));
 }
 
-#endif /* TAO_HAS_AMI_CALLBACK */
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index d6645dbc8cd..7b5ce37f55d 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -69,8 +69,6 @@ enum TAO_AMI_Reply_Status
 };
 
 
-#if (TAO_HAS_AMI_CALLBACK == 1)
-
 typedef void (*TAO_Reply_Handler_Skeleton)(
     TAO_InputCDR &,
     Messaging::ReplyHandler_ptr,
@@ -103,7 +101,6 @@ namespace TAO_Messaging_Helper
            ACE_ENV_ARG_DECL);
 }
 
-#endif /* TAO_HAS_AMI_CALLBACK */
 
 #include /**/ "ace/post.h"
 #endif /* TAO_MESSAGING_H */
diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc
index 25f9f55a596..955cf8fe6fe 100644
--- a/TAO/tao/Messaging/Messaging.mpc
+++ b/TAO/tao/Messaging/Messaging.mpc
@@ -2,4 +2,22 @@ project : taolib, core, portableserver {
   sharedname   = TAO_Messaging
   dynamicflags = TAO_MESSAGING_BUILD_DLL
   include_dir  = tao/Messaging
+
+    Source_Files {
+      Asynch_Invocation_Adapter.cpp
+      Asynch_Invocation.cpp
+      Asynch_Reply_Dispatcher.cpp
+      Asynch_Timeout_Handler.cpp
+      Connection_Timeout_Policy_i.cpp
+      Messaging.cpp
+      MessagingC.cpp
+      MessagingS.cpp
+      Messaging_No_ImplC.cpp
+      Messaging_RT_PolicyC.cpp
+      Messaging_SyncScope_PolicyC.cpp
+      TAO_ExtC.cpp
+      Messaging_ORBInitializer.cpp
+      Messaging_PolicyFactory.cpp
+      Messaging_Policy_i.cpp
+    }
 }