diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-08 10:20:06 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-08 10:20:06 +0000 |
| commit | 5cfab82fd2728de918b9ab864c23197e29049a77 (patch) | |
| tree | f9adb9df36493c936c13b28b42d0b3df7a7d6e8b | |
| parent | 95289af0460dd5909fd660a3e9edb5a994546fe7 (diff) | |
| download | ATCD-5cfab82fd2728de918b9ab864c23197e29049a77.tar.gz | |
ChangeLogTag: Fri Jun 08 10:20:00 UTC 2007 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp (renamed from TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c) | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 10b68618160..439224ddf89 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Jun 08 10:20:00 UTC 2007 Simon Massey <sma@prismtech.com> + + * TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c: + + Due to Window's MFC compatiable builds objecting to this + c file, it has been renamed to .cpp and extern "C" statements + included with the two functions that require C linkage. + Wed Jun 06 16:07:00 UTC 2007 Simon Massey <sma@prismtech.com> * TAO_IDL/ast/ast_type.cpp: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp index cea38d78e06..394bf05c1ab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp @@ -5,13 +5,13 @@ #include <openssl/asn1.h> -DSA * +extern "C" DSA * DSAPARAMS_DUP_WRAPPER_NAME (DSA * dsa) { return DSAparams_dup (dsa); } -DH * +extern "C" DH * DHPARAMS_DUP_WRAPPER_NAME (DH * dh) { return DHparams_dup (dh); |