diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h index a83c0990df7..ea9b5409325 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h @@ -3,11 +3,6 @@ #ifndef TAO_SSLIOP_PARAMS_DUP_H #define TAO_SSLIOP_PARAMS_DUP_H -#include /**/ "ace/pre.h" - -#include "ace/config-macros.h" -#include "tao/Versioned_Namespace.h" - // As of 0.9.7e, OpenSSL's DSAparams_dup() and DHparams_dup() macros // contain casts that are invalid in C++. These C wrapper functions // allows them to be called from C++. @@ -15,34 +10,15 @@ #include <openssl/dsa.h> #include <openssl/dh.h> -#if (defined (TAO_HAS_VERSIONED_NAMESPACE) \ - && TAO_HAS_VERSIONED_NAMESPACE == 1) \ - && !(defined (_MSC_VER) && _MSC_VER <= 1200) -// MSVC++ 6's preprocessor can't handle macro expansions required by -// the versioned namespace support. *sigh* - -# define DSAPARAMS_DUP_WRAPPER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _DSAparams_dup_wrapper) -# define DHPARAMS_DUP_WRAPPER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _DHparams_dup_wrapper) - -#else - -# define DSAPARAMS_DUP_WRAPPER_NAME DSAparams_dup_wrapper -# define DHPARAMS_DUP_WRAPPER_NAME DHparams_dup_wrapper - -#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - - #ifdef __cplusplus extern "C" { #endif -extern DSA *DSAPARAMS_DUP_WRAPPER_NAME (DSA *dsa); -extern DH *DHPARAMS_DUP_WRAPPER_NAME (DH *dh); +extern DSA *DSAparams_dup_wrapper (DSA *dsa); +extern DH *DHparams_dup_wrapper (DH *dh); #ifdef __cplusplus } #endif -#include /**/ "ace/post.h" - #endif |