summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
index ea9b5409325..07b382db8ba 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
@@ -10,6 +10,23 @@
#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