2 files changed, 26 insertions, 26 deletions
diff --git a/TAO/tao/IORTable/TAO_IORTable_Static.dsp b/TAO/tao/IORTable/TAO_IORTable_Static.dsp
index 5e97ae7ccd4..f679979e095 100644
--- a/TAO/tao/IORTable/TAO_IORTable_Static.dsp
+++ b/TAO/tao/IORTable/TAO_IORTable_Static.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "LIB\Release\IORTable"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D TAO_IORTABLE_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D ACE_OS_HAS_DLL=0 /D "_MBCS" /D "_LIB" /D "TAO_AS_STATIC_LIBS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LIB\Debug\IORTable"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D TAO_IORTABLE_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_MBCS" /D "_LIB" /D "TAO_AS_STATIC_LIBS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/tao/IORTable/iortable_export.h b/TAO/tao/IORTable/iortable_export.h
index 633e8f4f84e..ba6833bea98 100644
--- a/TAO/tao/IORTable/iortable_export.h
+++ b/TAO/tao/IORTable/iortable_export.h
@@ -1,40 +1,40 @@
+
 // -*- C++ -*-
 // $Id$
 // Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
+// This file is generated automatically by generate_export_file.pl
 // ------------------------------
 #ifndef TAO_IORTABLE_EXPORT_H
 #define TAO_IORTABLE_EXPORT_H
 
 #include "ace/config-all.h"
 
-#if !defined (TAO_IORTABLE_HAS_DLL)
-#define TAO_IORTABLE_HAS_DLL 1
-#endif /* ! TAO_IORTABLE_HAS_DLL */
-
-#if defined (TAO_IORTABLE_HAS_DLL)
-#  if (TAO_IORTABLE_HAS_DLL == 1)
-#    if defined (TAO_IORTABLE_BUILD_DLL)
-#      define TAO_IORTable_Export ACE_Proper_Export_Flag
-#      define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define TAO_IORTable_Export ACE_Proper_Import_Flag
-#      define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* TAO_IORTABLE_BUILD_DLL */
-#  else
-#    define TAO_IORTable_Export
-#    define TAO_IORTABLE_SINGLETON_DECLARATION(T)
-#    define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! TAO_IORTABLE_HAS_DLL == 1 */
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_IORTABLE_HAS_DLL)
+#    define TAO_IORTABLE_HAS_DLL 0
+#  endif /* ! TAO_IORTABLE_HAS_DLL */
 #else
+#  if !defined (TAO_IORTABLE_HAS_DLL)
+#    define TAO_IORTABLE_HAS_DLL 1
+#  endif /* ! TAO_IORTABLE_HAS_DLL */
+#endif
+
+#if defined (TAO_IORTABLE_HAS_DLL) && (TAO_IORTABLE_HAS_DLL == 1)
+#  if defined (TAO_IORTABLE_BUILD_DLL)
+#    define TAO_IORTable_Export ACE_Proper_Export_Flag
+#    define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_IORTABLE_BUILD_DLL */
+#    define TAO_IORTable_Export ACE_Proper_Import_Flag
+#    define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_IORTABLE_BUILD_DLL */
+#else /* TAO_IORTABLE_HAS_DLL == 1 */
 #  define TAO_IORTable_Export
 #  define TAO_IORTABLE_SINGLETON_DECLARATION(T)
 #  define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* TAO_IORTABLE_HAS_DLL */
+#endif /* TAO_IORTABLE_HAS_DLL == 1 */
 
-#endif     /* TAO_IORTABLE_EXPORT_H */
+#endif /* TAO_IORTABLE_EXPORT_H */
 
 // End of auto generated file.