Tue Aug 21 14:43:24 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

52 files changed, 263 insertions, 35 deletions

diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h
index 4b0bf7770ef..42fe33a8582 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TSEC_CHECKPOINT_EXEC_HAS_DLL)
+#  define TSEC_CHECKPOINT_EXEC_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TSEC_CHECKPOINT_EXEC_HAS_DLL */
+
 #if !defined (TSEC_CHECKPOINT_EXEC_HAS_DLL)
 #  define TSEC_CHECKPOINT_EXEC_HAS_DLL 1
 #endif /* ! TSEC_CHECKPOINT_EXEC_HAS_DLL */
@@ -42,7 +46,11 @@
 #if (TSEC_CHECKPOINT_EXEC_NTRACE == 1)
 #  define TSEC_CHECKPOINT_EXEC_TRACE(X)
 #else /* (TSEC_CHECKPOINT_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
 #  define TSEC_CHECKPOINT_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
 #endif /* (TSEC_CHECKPOINT_EXEC_NTRACE == 1) */
 
 #endif /* TSEC_CHECKPOINT_EXEC_EXPORT_H */
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h
index 5619f37d45d..b7d06a50172 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TSEC_CHECKPOINT_STUB_HAS_DLL)
+#  define TSEC_CHECKPOINT_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TSEC_CHECKPOINT_STUB_HAS_DLL */
+
 #if !defined (TSEC_CHECKPOINT_STUB_HAS_DLL)
 #  define TSEC_CHECKPOINT_STUB_HAS_DLL 1
 #endif /* ! TSEC_CHECKPOINT_STUB_HAS_DLL */
@@ -42,7 +46,11 @@
 #if (TSEC_CHECKPOINT_STUB_NTRACE == 1)
 #  define TSEC_CHECKPOINT_STUB_TRACE(X)
 #else /* (TSEC_CHECKPOINT_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
 #  define TSEC_CHECKPOINT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
 #endif /* (TSEC_CHECKPOINT_STUB_NTRACE == 1) */
 
 #endif /* TSEC_CHECKPOINT_STUB_EXPORT_H */
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h
index 99666df89e6..6d62a51e7f1 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TSEC_CHECKPOINT_SVNT_HAS_DLL)
+#  define TSEC_CHECKPOINT_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TSEC_CHECKPOINT_SVNT_HAS_DLL */
+
 #if !defined (TSEC_CHECKPOINT_SVNT_HAS_DLL)
 #  define TSEC_CHECKPOINT_SVNT_HAS_DLL 1
 #endif /* ! TSEC_CHECKPOINT_SVNT_HAS_DLL */
@@ -42,7 +46,11 @@
 #if (TSEC_CHECKPOINT_SVNT_NTRACE == 1)
 #  define TSEC_CHECKPOINT_SVNT_TRACE(X)
 #else /* (TSEC_CHECKPOINT_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
 #  define TSEC_CHECKPOINT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
 #endif /* (TSEC_CHECKPOINT_SVNT_NTRACE == 1) */
 
 #endif /* TSEC_CHECKPOINT_SVNT_EXPORT_H */
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h
index 05e87fade4b..eb90568f309 100644
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h
@@ -2,13 +2,17 @@
 // -*- C++ -*-
 // $Id$
 // Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ENW_SVNT
+// This file is generated automatically by generate_export_file.pl ENW_SKEL
 // ------------------------------
 #ifndef ENW_SKEL_EXPORT_H
 #define ENW_SKEL_EXPORT_H
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ENW_SKEL_HAS_DLL)
+#  define ENW_SKEL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ENW_SKEL_HAS_DLL */
+
 #if !defined (ENW_SKEL_HAS_DLL)
 #  define ENW_SKEL_HAS_DLL 1
 #endif /* ! ENW_SKEL_HAS_DLL */
@@ -42,7 +46,11 @@
 #if (ENW_SKEL_NTRACE == 1)
 #  define ENW_SKEL_TRACE(X)
 #else /* (ENW_SKEL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
 #  define ENW_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
 #endif /* (ENW_SKEL_NTRACE == 1) */
 
 #endif /* ENW_SKEL_EXPORT_H */
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h
index ce5a4067f67..dd8f95cc1f5 100644
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ENW_STUB_HAS_DLL)
+#  define ENW_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ENW_STUB_HAS_DLL */
+
 #if !defined (ENW_STUB_HAS_DLL)
 #  define ENW_STUB_HAS_DLL 1
 #endif /* ! ENW_STUB_HAS_DLL */
@@ -42,7 +46,11 @@
 #if (ENW_STUB_NTRACE == 1)
 #  define ENW_STUB_TRACE(X)
 #else /* (ENW_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
 #  define ENW_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
 #endif /* (ENW_STUB_NTRACE == 1) */
 
 #endif /* ENW_STUB_EXPORT_H */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h
index 9d4d2c15a8d..dfa59c5b267 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ATTRIBUTES_STUB_HAS_DLL)
+#  define ATTRIBUTES_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ATTRIBUTES_STUB_HAS_DLL */
+
 #if !defined (ATTRIBUTES_STUB_HAS_DLL)
 #  define ATTRIBUTES_STUB_HAS_DLL 1
 #endif /* ! ATTRIBUTES_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h
index d0502647130..e641264d206 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h
@@ -2,53 +2,57 @@
 // -*- C++ -*-
 // $Id$
 // Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl generate_export_file.pl ATTRIBUTES_SVNT
+// This file is generated automatically by generate_export_file.pl ATTRIBUTES_SVNT
 // ------------------------------
-#ifndef GENERATE_EXPORT_FILE.PL_EXPORT_H
-#define GENERATE_EXPORT_FILE.PL_EXPORT_H
+#ifndef ATTRIBUTES_SVNT_EXPORT_H
+#define ATTRIBUTES_SVNT_EXPORT_H
 
 #include "ace/config-all.h"
 
-#if !defined (GENERATE_EXPORT_FILE.PL_HAS_DLL)
-#  define GENERATE_EXPORT_FILE.PL_HAS_DLL 1
-#endif /* ! GENERATE_EXPORT_FILE.PL_HAS_DLL */
-
-#if defined (GENERATE_EXPORT_FILE.PL_HAS_DLL) && (GENERATE_EXPORT_FILE.PL_HAS_DLL == 1)
-#  if defined (GENERATE_EXPORT_FILE.PL_BUILD_DLL)
-#    define generate_export_file.pl_Export ACE_Proper_Export_Flag
-#    define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* GENERATE_EXPORT_FILE.PL_BUILD_DLL */
-#    define generate_export_file.pl_Export ACE_Proper_Import_Flag
-#    define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* GENERATE_EXPORT_FILE.PL_BUILD_DLL */
-#else /* GENERATE_EXPORT_FILE.PL_HAS_DLL == 1 */
-#  define generate_export_file.pl_Export
-#  define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T)
-#  define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* GENERATE_EXPORT_FILE.PL_HAS_DLL == 1 */
-
-// Set GENERATE_EXPORT_FILE.PL_NTRACE = 0 to turn on library specific tracing even if
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ATTRIBUTES_SVNT_HAS_DLL)
+#  define ATTRIBUTES_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ATTRIBUTES_SVNT_HAS_DLL */
+
+#if !defined (ATTRIBUTES_SVNT_HAS_DLL)
+#  define ATTRIBUTES_SVNT_HAS_DLL 1
+#endif /* ! ATTRIBUTES_SVNT_HAS_DLL */
+
+#if defined (ATTRIBUTES_SVNT_HAS_DLL) && (ATTRIBUTES_SVNT_HAS_DLL == 1)
+#  if defined (ATTRIBUTES_SVNT_BUILD_DLL)
+#    define ATTRIBUTES_SVNT_Export ACE_Proper_Export_Flag
+#    define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ATTRIBUTES_SVNT_BUILD_DLL */
+#    define ATTRIBUTES_SVNT_Export ACE_Proper_Import_Flag
+#    define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ATTRIBUTES_SVNT_BUILD_DLL */
+#else /* ATTRIBUTES_SVNT_HAS_DLL == 1 */
+#  define ATTRIBUTES_SVNT_Export
+#  define ATTRIBUTES_SVNT_SINGLETON_DECLARATION(T)
+#  define ATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ATTRIBUTES_SVNT_HAS_DLL == 1 */
+
+// Set ATTRIBUTES_SVNT_NTRACE = 0 to turn on library specific tracing even if
 // tracing is turned off for ACE.
-#if !defined (GENERATE_EXPORT_FILE.PL_NTRACE)
+#if !defined (ATTRIBUTES_SVNT_NTRACE)
 #  if (ACE_NTRACE == 1)
-#    define GENERATE_EXPORT_FILE.PL_NTRACE 1
+#    define ATTRIBUTES_SVNT_NTRACE 1
 #  else /* (ACE_NTRACE == 1) */
-#    define GENERATE_EXPORT_FILE.PL_NTRACE 0
+#    define ATTRIBUTES_SVNT_NTRACE 0
 #  endif /* (ACE_NTRACE == 1) */
-#endif /* !GENERATE_EXPORT_FILE.PL_NTRACE */
+#endif /* !ATTRIBUTES_SVNT_NTRACE */
 
-#if (GENERATE_EXPORT_FILE.PL_NTRACE == 1)
-#  define GENERATE_EXPORT_FILE.PL_TRACE(X)
-#else /* (GENERATE_EXPORT_FILE.PL_NTRACE == 1) */
+#if (ATTRIBUTES_SVNT_NTRACE == 1)
+#  define ATTRIBUTES_SVNT_TRACE(X)
+#else /* (ATTRIBUTES_SVNT_NTRACE == 1) */
 #  if !defined (ACE_HAS_TRACE)
 #    define ACE_HAS_TRACE
 #  endif /* ACE_HAS_TRACE */
-#  define GENERATE_EXPORT_FILE.PL_TRACE(X) ACE_TRACE_IMPL(X)
+#  define ATTRIBUTES_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
 #  include "ace/Trace.h"
-#endif /* (GENERATE_EXPORT_FILE.PL_NTRACE == 1) */
+#endif /* (ATTRIBUTES_SVNT_NTRACE == 1) */
 
-#endif /* GENERATE_EXPORT_FILE.PL_EXPORT_H */
+#endif /* ATTRIBUTES_SVNT_EXPORT_H */
 
 // End of auto generated file.
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h
index 5e6963b7f4f..e2a7f876165 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSINK_STUB_HAS_DLL)
+#  define EVENTSINK_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTSINK_STUB_HAS_DLL */
+
 #if !defined (EVENTSINK_STUB_HAS_DLL)
 #  define EVENTSINK_STUB_HAS_DLL 1
 #endif /* ! EVENTSINK_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h
index e1dbe769461..b30cb9768c2 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSINK_SVNT_HAS_DLL)
+#  define EVENTSINK_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTSINK_SVNT_HAS_DLL */
+
 #if !defined (EVENTSINK_SVNT_HAS_DLL)
 #  define EVENTSINK_SVNT_HAS_DLL 1
 #endif /* ! EVENTSINK_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h
index 8c80a91e464..a0cf71bbe6d 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSOURCE_STUB_HAS_DLL)
+#  define EVENTSOURCE_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTSOURCE_STUB_HAS_DLL */
+
 #if !defined (EVENTSOURCE_STUB_HAS_DLL)
 #  define EVENTSOURCE_STUB_HAS_DLL 1
 #endif /* ! EVENTSOURCE_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h
index 78c609aa7ef..dd5eeacd906 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTSOURCE_SVNT_HAS_DLL)
+#  define EVENTSOURCE_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTSOURCE_SVNT_HAS_DLL */
+
 #if !defined (EVENTSOURCE_SVNT_HAS_DLL)
 #  define EVENTSOURCE_SVNT_HAS_DLL 1
 #endif /* ! EVENTSOURCE_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h
index c672c9f7afe..025fc8215f2 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FACETS_STUB_HAS_DLL)
+#  define FACETS_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FACETS_STUB_HAS_DLL */
+
 #if !defined (FACETS_STUB_HAS_DLL)
 #  define FACETS_STUB_HAS_DLL 1
 #endif /* ! FACETS_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h
index 83f80320592..e4750de9b91 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FACETS_SVNT_HAS_DLL)
+#  define FACETS_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FACETS_SVNT_HAS_DLL */
+
 #if !defined (FACETS_SVNT_HAS_DLL)
 #  define FACETS_SVNT_HAS_DLL 1
 #endif /* ! FACETS_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h
index 39c2bbeb0ca..15dedbc8a73 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEPTACLES_STUB_HAS_DLL)
+#  define RECEPTACLES_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && RECEPTACLES_STUB_HAS_DLL */
+
 #if !defined (RECEPTACLES_STUB_HAS_DLL)
 #  define RECEPTACLES_STUB_HAS_DLL 1
 #endif /* ! RECEPTACLES_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h
index d0dcd4e3b67..4a4a4f52dcd 100644
--- a/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEPTACLES_SVNT_HAS_DLL)
+#  define RECEPTACLES_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && RECEPTACLES_SVNT_HAS_DLL */
+
 #if !defined (RECEPTACLES_SVNT_HAS_DLL)
 #  define RECEPTACLES_SVNT_HAS_DLL 1
 #endif /* ! RECEPTACLES_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h
index 2faae1ed285..add746da8f5 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_EXEC_HAS_DLL)
+#  define SIMPLECOMPONENT_EXEC_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_EXEC_HAS_DLL */
+
 #if !defined (SIMPLECOMPONENT_EXEC_HAS_DLL)
 #  define SIMPLECOMPONENT_EXEC_HAS_DLL 1
 #endif /* ! SIMPLECOMPONENT_EXEC_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h
index 45beb98405b..eb8cb7a6c97 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_STUB_HAS_DLL)
+#  define SIMPLECOMPONENT_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_STUB_HAS_DLL */
+
 #if !defined (SIMPLECOMPONENT_STUB_HAS_DLL)
 #  define SIMPLECOMPONENT_STUB_HAS_DLL 1
 #endif /* ! SIMPLECOMPONENT_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h
index 07f08b8eaa0..694af85e994 100644
--- a/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h
+++ b/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMPONENT_SVNT_HAS_DLL)
+#  define SIMPLECOMPONENT_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMPONENT_SVNT_HAS_DLL */
+
 #if !defined (SIMPLECOMPONENT_SVNT_HAS_DLL)
 #  define SIMPLECOMPONENT_SVNT_HAS_DLL 1
 #endif /* ! SIMPLECOMPONENT_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h b/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h
index 43d8e34ee72..2ec86f36950 100644
--- a/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h
+++ b/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ABSTRACT_STUB_HAS_DLL)
+#  define ABSTRACT_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ABSTRACT_STUB_HAS_DLL */
+
 #if !defined (ABSTRACT_STUB_HAS_DLL)
 #  define ABSTRACT_STUB_HAS_DLL 1
 #endif /* ! ABSTRACT_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h b/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h
index 53b5032df69..890926fec22 100644
--- a/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h
+++ b/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ABSTRACT_SVNT_HAS_DLL)
+#  define ABSTRACT_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ABSTRACT_SVNT_HAS_DLL */
+
 #if !defined (ABSTRACT_SVNT_HAS_DLL)
 #  define ABSTRACT_SVNT_HAS_DLL 1
 #endif /* ! ABSTRACT_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h b/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h
index 9c8b885ba96..7185b7d78b2 100644
--- a/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h
+++ b/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (REGULAR_STUB_HAS_DLL)
+#  define REGULAR_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && REGULAR_STUB_HAS_DLL */
+
 #if !defined (REGULAR_STUB_HAS_DLL)
 #  define REGULAR_STUB_HAS_DLL 1
 #endif /* ! REGULAR_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h b/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h
index a8faf5e0b6f..05a2687b566 100644
--- a/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h
+++ b/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (REGULAR_SVNT_HAS_DLL)
+#  define REGULAR_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && REGULAR_SVNT_HAS_DLL */
+
 #if !defined (REGULAR_SVNT_HAS_DLL)
 #  define REGULAR_SVNT_HAS_DLL 1
 #endif /* ! REGULAR_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h
index 191b303e6d3..f347446a533 100644
--- a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h
+++ b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (HOMEATTRIBUTES_STUB_HAS_DLL)
+#  define HOMEATTRIBUTES_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && HOMEATTRIBUTES_STUB_HAS_DLL */
+
 #if !defined (HOMEATTRIBUTES_STUB_HAS_DLL)
 #  define HOMEATTRIBUTES_STUB_HAS_DLL 1
 #endif /* ! HOMEATTRIBUTES_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h
index 88639ab9f16..f99dd7694f3 100644
--- a/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h
+++ b/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (HOMEATTRIBUTES_SVNT_HAS_DLL)
+#  define HOMEATTRIBUTES_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && HOMEATTRIBUTES_SVNT_HAS_DLL */
+
 #if !defined (HOMEATTRIBUTES_SVNT_HAS_DLL)
 #  define HOMEATTRIBUTES_SVNT_HAS_DLL 1
 #endif /* ! HOMEATTRIBUTES_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h b/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h
index 97727bb3a01..469d1f6827c 100644
--- a/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h
+++ b/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_STUB_HAS_DLL)
+#  define BASIC_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && BASIC_STUB_HAS_DLL */
+
 #if !defined (BASIC_STUB_HAS_DLL)
 #  define BASIC_STUB_HAS_DLL 1
 #endif /* ! BASIC_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h b/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h
index 3bc632db060..569fe626ebc 100644
--- a/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h
+++ b/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_SVNT_HAS_DLL)
+#  define BASIC_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && BASIC_SVNT_HAS_DLL */
+
 #if !defined (BASIC_SVNT_HAS_DLL)
 #  define BASIC_SVNT_HAS_DLL 1
 #endif /* ! BASIC_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h b/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h
index d1e43b3c0ec..4a5cbf3ac4e 100644
--- a/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h
+++ b/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FACTORY_STUB_HAS_DLL)
+#  define FACTORY_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FACTORY_STUB_HAS_DLL */
+
 #if !defined (FACTORY_STUB_HAS_DLL)
 #  define FACTORY_STUB_HAS_DLL 1
 #endif /* ! FACTORY_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h b/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h
index 747fde7ba3d..3bfb6c71d9e 100644
--- a/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h
+++ b/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FACTORY_SVNT_HAS_DLL)
+#  define FACTORY_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FACTORY_SVNT_HAS_DLL */
+
 #if !defined (FACTORY_SVNT_HAS_DLL)
 #  define FACTORY_SVNT_HAS_DLL 1
 #endif /* ! FACTORY_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h b/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h
index 9ff0b76fd8a..4d9cd68fe15 100644
--- a/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h
+++ b/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FINDER_STUB_HAS_DLL)
+#  define FINDER_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FINDER_STUB_HAS_DLL */
+
 #if !defined (FINDER_STUB_HAS_DLL)
 #  define FINDER_STUB_HAS_DLL 1
 #endif /* ! FINDER_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h b/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h
index 46e8202dab5..87a52c9df52 100644
--- a/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h
+++ b/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FINDER_SVNT_HAS_DLL)
+#  define FINDER_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FINDER_SVNT_HAS_DLL */
+
 #if !defined (FINDER_SVNT_HAS_DLL)
 #  define FINDER_SVNT_HAS_DLL 1
 #endif /* ! FINDER_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h
index e5bf83d5f7f..8850bb78150 100644
--- a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h
+++ b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (INHERITANCE_STUB_HAS_DLL)
+#  define INHERITANCE_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && INHERITANCE_STUB_HAS_DLL */
+
 #if !defined (INHERITANCE_STUB_HAS_DLL)
 #  define INHERITANCE_STUB_HAS_DLL 1
 #endif /* ! INHERITANCE_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h
index fa4e1c0026b..083c201538a 100644
--- a/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h
+++ b/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (INHERITANCE_SVNT_HAS_DLL)
+#  define INHERITANCE_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && INHERITANCE_SVNT_HAS_DLL */
+
 #if !defined (INHERITANCE_SVNT_HAS_DLL)
 #  define INHERITANCE_SVNT_HAS_DLL 1
 #endif /* ! INHERITANCE_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h
index 1e735493546..b58cac3acfc 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ICBASIC_STUB_HAS_DLL)
+#  define ICBASIC_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ICBASIC_STUB_HAS_DLL */
+
 #if !defined (ICBASIC_STUB_HAS_DLL)
 #  define ICBASIC_STUB_HAS_DLL 1
 #endif /* ! ICBASIC_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h
index b6c09e43f24..de3714a6c75 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ICBASIC_SVNT_HAS_DLL)
+#  define ICBASIC_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ICBASIC_SVNT_HAS_DLL */
+
 #if !defined (ICBASIC_SVNT_HAS_DLL)
 #  define ICBASIC_SVNT_HAS_DLL 1
 #endif /* ! ICBASIC_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h
index d32e9541f3e..c773bbcf313 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ICEVENTSINK_STUB_HAS_DLL)
+#  define ICEVENTSINK_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ICEVENTSINK_STUB_HAS_DLL */
+
 #if !defined (ICEVENTSINK_STUB_HAS_DLL)
 #  define ICEVENTSINK_STUB_HAS_DLL 1
 #endif /* ! ICEVENTSINK_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h
index 2df3d57fbdf..10eed510dea 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ICEVENTSINK_SVNT_HAS_DLL)
+#  define ICEVENTSINK_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ICEVENTSINK_SVNT_HAS_DLL */
+
 #if !defined (ICEVENTSINK_SVNT_HAS_DLL)
 #  define ICEVENTSINK_SVNT_HAS_DLL 1
 #endif /* ! ICEVENTSINK_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h
index a5e067553d2..f28d2ba2d3a 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ICEVENTSOURCE_STUB_HAS_DLL)
+#  define ICEVENTSOURCE_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ICEVENTSOURCE_STUB_HAS_DLL */
+
 #if !defined (ICEVENTSOURCE_STUB_HAS_DLL)
 #  define ICEVENTSOURCE_STUB_HAS_DLL 1
 #endif /* ! ICEVENTSOURCE_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h
index 24ca972b917..b7269a38b47 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ICEVENTSOURCE_SVNT_HAS_DLL)
+#  define ICEVENTSOURCE_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ICEVENTSOURCE_SVNT_HAS_DLL */
+
 #if !defined (ICEVENTSOURCE_SVNT_HAS_DLL)
 #  define ICEVENTSOURCE_SVNT_HAS_DLL 1
 #endif /* ! ICEVENTSOURCE_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h
index f23222462d2..2571741be01 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ICRECEPTACLES_STUB_HAS_DLL)
+#  define ICRECEPTACLES_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ICRECEPTACLES_STUB_HAS_DLL */
+
 #if !defined (ICRECEPTACLES_STUB_HAS_DLL)
 #  define ICRECEPTACLES_STUB_HAS_DLL 1
 #endif /* ! ICRECEPTACLES_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h
index 6929ea5edd2..d826479eeaa 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ICRECEPTACLES_SVNT_HAS_DLL)
+#  define ICRECEPTACLES_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ICRECEPTACLES_SVNT_HAS_DLL */
+
 #if !defined (ICRECEPTACLES_SVNT_HAS_DLL)
 #  define ICRECEPTACLES_SVNT_HAS_DLL 1
 #endif /* ! ICRECEPTACLES_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h
index 096a67f9beb..be696db1402 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTS_STUB_HAS_DLL)
+#  define EVENTS_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTS_STUB_HAS_DLL */
+
 #if !defined (EVENTS_STUB_HAS_DLL)
 #  define EVENTS_STUB_HAS_DLL 1
 #endif /* ! EVENTS_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h
index 5f647a0740a..bca88a9a54a 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EVENTS_SVNT_HAS_DLL)
+#  define EVENTS_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EVENTS_SVNT_HAS_DLL */
+
 #if !defined (EVENTS_SVNT_HAS_DLL)
 #  define EVENTS_SVNT_HAS_DLL 1
 #endif /* ! EVENTS_SVNT_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h
index 2d9a1562f59..e7ba466797c 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (HOMES_STUB_HAS_DLL)
+#  define HOMES_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && HOMES_STUB_HAS_DLL */
+
 #if !defined (HOMES_STUB_HAS_DLL)
 #  define HOMES_STUB_HAS_DLL 1
 #endif /* ! HOMES_STUB_HAS_DLL */
diff --git a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h
index d8d89bd8d61..16fc4127d94 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h
+++ b/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (HOMES_SVNT_HAS_DLL)
+#  define HOMES_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && HOMES_SVNT_HAS_DLL */
+
 #if !defined (HOMES_SVNT_HAS_DLL)
 #  define HOMES_SVNT_HAS_DLL 1
 #endif /* ! HOMES_SVNT_HAS_DLL */
diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h
index 9ca0e6c6be1..99c1d64369b 100644
--- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h
+++ b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (MINIMUM_BASE_STUB_HAS_DLL)
+#  define MINIMUM_BASE_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && MINIMUM_BASE_STUB_HAS_DLL */
+
 #if !defined (MINIMUM_BASE_STUB_HAS_DLL)
 #  define MINIMUM_BASE_STUB_HAS_DLL 1
 #endif /* ! MINIMUM_BASE_STUB_HAS_DLL */
diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h
index 52adebee2f5..ffde95ace0c 100644
--- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h
+++ b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (MINIMUM_BASE_SVNT_HAS_DLL)
+#  define MINIMUM_BASE_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && MINIMUM_BASE_SVNT_HAS_DLL */
+
 #if !defined (MINIMUM_BASE_SVNT_HAS_DLL)
 #  define MINIMUM_BASE_SVNT_HAS_DLL 1
 #endif /* ! MINIMUM_BASE_SVNT_HAS_DLL */
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h b/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h
index 8ad3640d130..9ae7b9ce799 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_EXEC_HAS_DLL)
+#  define RECEIVER_EXEC_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && RECEIVER_EXEC_HAS_DLL */
+
 #if !defined (RECEIVER_EXEC_HAS_DLL)
 #  define RECEIVER_EXEC_HAS_DLL 1
 #endif /* ! RECEIVER_EXEC_HAS_DLL */
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h b/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h
index c457802854f..ad411db973f 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_STUB_HAS_DLL)
+#  define RECEIVER_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && RECEIVER_STUB_HAS_DLL */
+
 #if !defined (RECEIVER_STUB_HAS_DLL)
 #  define RECEIVER_STUB_HAS_DLL 1
 #endif /* ! RECEIVER_STUB_HAS_DLL */
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h b/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h
index 1c9eca2556d..51ed45dc299 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_SVNT_HAS_DLL)
+#  define RECEIVER_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && RECEIVER_SVNT_HAS_DLL */
+
 #if !defined (RECEIVER_SVNT_HAS_DLL)
 #  define RECEIVER_SVNT_HAS_DLL 1
 #endif /* ! RECEIVER_SVNT_HAS_DLL */
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec_export.h b/CIAO/tests/Minimum/Sender/Sender_exec_export.h
index dbaa7ea15bc..ad4328e98c2 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec_export.h
+++ b/CIAO/tests/Minimum/Sender/Sender_exec_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_EXEC_HAS_DLL)
+#  define SENDER_EXEC_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SENDER_EXEC_HAS_DLL */
+
 #if !defined (SENDER_EXEC_HAS_DLL)
 #  define SENDER_EXEC_HAS_DLL 1
 #endif /* ! SENDER_EXEC_HAS_DLL */
diff --git a/CIAO/tests/Minimum/Sender/Sender_stub_export.h b/CIAO/tests/Minimum/Sender/Sender_stub_export.h
index 28c5d3131d0..c545045ceae 100644
--- a/CIAO/tests/Minimum/Sender/Sender_stub_export.h
+++ b/CIAO/tests/Minimum/Sender/Sender_stub_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_STUB_HAS_DLL)
+#  define SENDER_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SENDER_STUB_HAS_DLL */
+
 #if !defined (SENDER_STUB_HAS_DLL)
 #  define SENDER_STUB_HAS_DLL 1
 #endif /* ! SENDER_STUB_HAS_DLL */
diff --git a/CIAO/tests/Minimum/Sender/Sender_svnt_export.h b/CIAO/tests/Minimum/Sender/Sender_svnt_export.h
index 53236a883f2..3d8729c51fa 100644
--- a/CIAO/tests/Minimum/Sender/Sender_svnt_export.h
+++ b/CIAO/tests/Minimum/Sender/Sender_svnt_export.h
@@ -9,6 +9,10 @@
 
 #include "ace/config-all.h"
 
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_SVNT_HAS_DLL)
+#  define SENDER_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SENDER_SVNT_HAS_DLL */
+
 #if !defined (SENDER_SVNT_HAS_DLL)
 #  define SENDER_SVNT_HAS_DLL 1
 #endif /* ! SENDER_SVNT_HAS_DLL */