diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-17 14:52:41 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-17 14:52:41 +0000 |
commit | 78904c4b671ce427bdac688923287451a5ad6a23 (patch) | |
tree | 4600088766138ecc026634c2509949269b85cc31 | |
parent | 8ac91044cefdb78161c7150d09cf519a09de8446 (diff) | |
download | ATCD-78904c4b671ce427bdac688923287451a5ad6a23.tar.gz |
ChangeLogTag:Thu Nov 17 06:49:02 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 12 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c | 10 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h | 4 |
3 files changed, 20 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ee1f6401a24..b3b50ef0e0e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Thu Nov 17 06:49:02 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/SSLIOP/params_dup.h: + + Declare wrap per functions with their versioned namespace macro + counterparts. + + * orbsvcs/orbsvcs/SSLIOP/params_dup.c: + + Include "params_dup.h" to pull in wrapper function names with + versioned namespace support. + Thu Nov 17 13:17:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * examples/Borland/ChatClient.mpc: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c index 6199894cab0..2c54418d138 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c @@ -1,19 +1,21 @@ // $Id$ +#include "params_dup.h" + #include <openssl/asn1.h> #include <openssl/dsa.h> #include <openssl/dh.h> DSA * -DSAPARAMS_DUP_WRAPPER_NAME (DSA *dsa) +DSAPARAMS_DUP_WRAPPER_NAME (DSA * dsa) { - return DSAparams_dup (dsa); + return DSAparams_dup (dsa); } DH * -DHPARAMS_DUP_WRAPPER_NAME (DH *dh) +DHPARAMS_DUP_WRAPPER_NAME (DH * dh) { - return DHparams_dup (dh); + return DHparams_dup (dh); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h index 07b382db8ba..42bb96d7b72 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h @@ -31,8 +31,8 @@ extern "C" { #endif -extern DSA *DSAparams_dup_wrapper (DSA *dsa); -extern DH *DHparams_dup_wrapper (DH *dh); +extern DSA *DSAPARAMS_DUP_WRAPPER_NAME (DSA *dsa); +extern DH *DHPARAMS_DUP_WRAPPER_NAME (DH *dh); #ifdef __cplusplus } |