diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 13:39:42 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 13:39:42 +0000 |
| commit | 423ce5ea394f698b0bfe68f2c22691686138abf5 (patch) | |
| tree | 2e31d21b592cb20a56de4a2e432d3c184f8f372b /TAO/orbsvcs | |
| parent | cdb93bd2fb937d922109a8c303cbad632f8776fc (diff) | |
| download | ATCD-423ce5ea394f698b0bfe68f2c22691686138abf5.tar.gz | |
ChangeLogTag: Wed Apr 19 13:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h index a83c0990df7..350705ec2d0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h @@ -15,11 +15,7 @@ #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* +#if (defined (TAO_HAS_VERSIONED_NAMESPACE) && TAO_HAS_VERSIONED_NAMESPACE == 1) # 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) |