5 files changed, 9 insertions, 47 deletions
diff --git a/tao/BiDir_GIOP/BiDirGIOP.cpp b/tao/BiDir_GIOP/BiDirGIOP.cpp
index c91d240c010..15b19c31940 100644
--- a/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -117,6 +117,6 @@ ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader,
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
 
-ACE_FACTORY_DEFINE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader)
+ACE_FACTORY_DEFINE (TAO_BIDIRGIOP, TAO_BiDirGIOP_Loader)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/BiDir_GIOP/BiDirGIOP.h b/tao/BiDir_GIOP/BiDirGIOP.h
index cc3c3c0eb3b..a1c248a7699 100644
--- a/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/tao/BiDir_GIOP/BiDirGIOP.h
@@ -38,7 +38,7 @@ class TAO_BiDirPolicy_Validator;
  * @brief Class that loads the BiDir library.
  */
 
-class TAO_BiDirGIOP_Export TAO_BiDirGIOP_Loader : public TAO_BiDir_Adapter
+class TAO_BIDIRGIOP_Export TAO_BiDirGIOP_Loader : public TAO_BiDir_Adapter
 {
 public:
 
@@ -69,7 +69,7 @@ TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer ();
 
 
 ACE_STATIC_SVC_DECLARE (TAO_BiDirGIOP_Loader)
-ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader)
+ACE_FACTORY_DECLARE (TAO_BIDIRGIOP, TAO_BiDirGIOP_Loader)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/tao/BiDir_GIOP/BiDirPolicy_Validator.h
index d156e161a51..82cc3789345 100644
--- a/tao/BiDir_GIOP/BiDirPolicy_Validator.h
+++ b/tao/BiDir_GIOP/BiDirPolicy_Validator.h
@@ -36,7 +36,7 @@ class TAO_ORB_Core;
  * @brief Policy Validator for BiDir GIOP class
  *
  */
-class TAO_BiDirGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator
+class TAO_BIDIRGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator
 {
 public:
   TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core);
diff --git a/tao/BiDir_GIOP/BiDir_GIOP.mpc b/tao/BiDir_GIOP/BiDir_GIOP.mpc
index f33fc0b431e..f1c6a688be0 100644
--- a/tao/BiDir_GIOP/BiDir_GIOP.mpc
+++ b/tao/BiDir_GIOP/BiDir_GIOP.mpc
@@ -3,11 +3,12 @@ project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
     idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \
-                -Wb,export_macro=TAO_BiDirGIOP_Export \
-                -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h \
+                -Wb,stub_export_macro=TAO_BIDIRGIOP_Export \
+                -Wb,stub_export_include=tao/BiDir_GIOP/bidirgiop_export.h \
+                -Wb,stub_export_file=bidirgiop_export.h \
                 -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE \
                 -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h \
-                -iC BiDir_GIOP
+                -iC BiDir_GIOP -Gxhst
     BiDirPolicy.pidl
   }
 
@@ -28,6 +29,7 @@ project(BiDir_GIOP) : taolib, tao_output, install, pi, taoidldefaults {
 
   Header_Files {
     *.h
+    bidirgiop_export.h
     BiDirPolicyC.h
     BiDirPolicyS.h
   }
diff --git a/tao/BiDir_GIOP/bidirgiop_export.h b/tao/BiDir_GIOP/bidirgiop_export.h
deleted file mode 100644
index 664fba705b7..00000000000
--- a/tao/BiDir_GIOP/bidirgiop_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_BIDIRGIOP_EXPORT_H
-#define TAO_BIDIRGIOP_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_BIDIRGIOP_HAS_DLL)
-#    define TAO_BIDIRGIOP_HAS_DLL 0
-#  endif /* ! TAO_BIDIRGIOP_HAS_DLL */
-#else
-#  if !defined (TAO_BIDIRGIOP_HAS_DLL)
-#    define TAO_BIDIRGIOP_HAS_DLL 1
-#  endif /* ! TAO_BIDIRGIOP_HAS_DLL */
-#endif
-
-#if defined (TAO_BIDIRGIOP_HAS_DLL) && (TAO_BIDIRGIOP_HAS_DLL == 1)
-#  if defined (TAO_BIDIRGIOP_BUILD_DLL)
-#    define TAO_BiDirGIOP_Export ACE_Proper_Export_Flag
-#    define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_BIDIRGIOP_BUILD_DLL */
-#    define TAO_BiDirGIOP_Export ACE_Proper_Import_Flag
-#    define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_BIDIRGIOP_BUILD_DLL */
-#else /* TAO_BIDIRGIOP_HAS_DLL == 1 */
-#  define TAO_BiDirGIOP_Export
-#  define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T)
-#  define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_BIDIRGIOP_HAS_DLL == 1 */
-
-#endif /* TAO_BIDIRGIOP_EXPORT_H */
-
-// End of auto generated file.