ChangeLogTag: Wed Jun 13 12:40:00 UTC 2007 Simon Massey <sma@prismtech.com>

3 files changed, 46 insertions, 3 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6c005e717ab..7f4e470fe7a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jun 13 12:40:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/orbsvcs/SSLIOP.mpc:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.c:
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.cpp:
+
+          Annoying conflict of interest, having to revert the
+          params_dup.c change/rename and put in another params_dup.cpp
+          (that simply extern "C" block #includes paramer_dup.c)
+          making which file is build conditional within the controlling
+          mpc file.
+
 Tue Jun 12 15:52:09 UTC 2007  Ciju John  <johnc at ociweb dot com>
 
         * orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index d503a35ee0b..e8d39a8a09b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -16,7 +16,38 @@ project(SSLIOP) : orbsvcslib, install, security, ssl, pi_server, interceptors, t
 
   Source_Files(ORBSVCS_COMPONENTS) {
     SSLIOP {
-      SSLIOP
+      ./SSLIOP/IIOP_SSL_Acceptor.cpp
+      ./SSLIOP/IIOP_SSL_Connection_Handler.cpp
+      ./SSLIOP/IIOP_SSL_Connector.cpp
+      ./SSLIOP/IIOP_SSL_Transport.cpp
+      ./SSLIOP/ssl_endpointsC.cpp
+      ./SSLIOP/SSLIOP_Accept_Strategy.cpp
+      ./SSLIOP/SSLIOP_Acceptor.cpp
+      ./SSLIOP/SSLIOP_ClientCredentials.cpp
+      ./SSLIOP/SSLIOP_Connection_Handler.cpp
+      ./SSLIOP/SSLIOP_Connector.cpp
+      ./SSLIOP/SSLIOP_Credentials.cpp
+      ./SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+      ./SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+      ./SSLIOP/SSLIOP_Current.cpp
+      ./SSLIOP/SSLIOP_Current_Impl.cpp
+      ./SSLIOP/SSLIOP_Endpoint.cpp
+      ./SSLIOP/SSLIOP_EVP_PKEY.cpp
+      ./SSLIOP/SSLIOP_Factory.cpp
+      ./SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+      ./SSLIOP/SSLIOP_OpenSSL_st_T.cpp
+      ./SSLIOP/SSLIOP_ORBInitializer.cpp
+      ./SSLIOP/SSLIOP_OwnCredentials.cpp
+      ./SSLIOP/SSLIOP_Profile.cpp
+      ./SSLIOP/SSLIOP_TargetCredentials.cpp
+      ./SSLIOP/SSLIOP_Transport.cpp
+      ./SSLIOP/SSLIOP_Util.cpp
+      SSLIOPC.cpp
+      conditional(vc71, vc8) {
+        ./SSLIOP/params_dup.cpp
+      } else {
+        ./SSLIOP/params_dup.c
+      }
     }
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
index 394bf05c1ab..cea38d78e06 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
@@ -5,13 +5,13 @@
 #include <openssl/asn1.h>
 
 
-extern "C" DSA *
+DSA *
 DSAPARAMS_DUP_WRAPPER_NAME (DSA * dsa)
 {
   return DSAparams_dup (dsa);
 }
 
-extern "C" DH *
+DH *
 DHPARAMS_DUP_WRAPPER_NAME (DH * dh)
 {
   return DHparams_dup (dh);