ChangeLogTag: Thu Jun 14 10:28:00 UTC 2007 Simon Massey <sma@prismtech.com>

2 files changed, 26 insertions, 3 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7f4e470fe7a..f69f4dc9006 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jun 14 10:28:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/orbsvcs/SSLIOP/params_dup.cpp:
+
+          Now the windows files are objecting to C linkage of
+          the included c file. Having to backstep the cpp file
+          to my original mods style once again which we know
+          works on the windows platforms.
+
 Wed Jun 13 12:40:00 UTC 2007  Simon Massey  <sma@prismtech.com>
 
         * orbsvcs/orbsvcs/SSLIOP.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
index 2bc56ed264d..d06b1bf8923 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
@@ -2,8 +2,22 @@
 
 // MFC style projects on MicroSoft compilers require CPP files
 // They can't cope with c files (as MFC projects are CPP by
-// there very nature).
+// there very nature). Some other platforms incorrectly can't
+// cope with the openSSL DSAParams_dup/DHparams_dup when compiled
+// under cpp files (which is why this file duplicates the
+// params_dup.c file).
 
-extern "C" {
-#include "params_dup.c"
+#include "params_dup.h"
+#include <openssl/asn1.h>
+
+extern "C" DSA *
+DSAPARAMS_DUP_WRAPPER_NAME (DSA * dsa)
+{
+  return DSAparams_dup (dsa);
+}
+
+extern "C" DH *
+DHPARAMS_DUP_WRAPPER_NAME (DH * dh)
+{
+  return DHparams_dup (dh);
 }