[omniORB] omniDynamic DLL on NT

Tim S. Woodall tim@ns.redpt.com
Thu, 03 Feb 2000 21:20:27 -0600


The following changes to the current omniORB_300 baseline
seem to correct the DLL initialization problem on NT. Note
that I haven't tested the DynAny functionality, only successfully
linked to the DLL.


Regards,
Tim S. Woodall
RedPoint Network Systems
tim@redpt.com


Index: dynamicLib.h
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB2/Attic/dynamicLib.h,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 dynamicLib.h
43a44,52
> #if defined(DLLEXPORT)
> #define DECLSPEC __declspec(dllexport)
> #elif defined(DLLIMPORT)
> #define DECLSPEC __declspec(dllimport)
> #else
> #define DECLSPEC
> #endif
>
>
52c61
<   static omniDynamicLib* ops;
---
>   static DECLSPEC omniDynamicLib* ops;
56c65
<   static omniDynamicLib* hook;
---
>   static DECLSPEC omniDynamicLib* hook;
61c70
<   static char link_in;
---
>   static DECLSPEC char link_in;
Index: dynamic/dynamicLib.cc
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB2/dynamic/Attic/dynamicLib.cc,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 dynamicLib.cc
59a60
> #ifndef __WIN32__
60a62
> #endif
Index: dynamic/sharedlib/dir.mk
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB2/dynamic/sharedlib/dir.mk,v
retrieving revision 1.13.6.2
diff -r1.13.6.2 dir.mk
69a70
> DIR_CPPFLAGS += -DDLLIMPORT
Index: orbcore/sharedlib/dir.mk
===================================================================
RCS file: /cvsroot/omni/src/lib/omniORB2/orbcore/sharedlib/dir.mk,v
retrieving revision 1.11.6.4
diff -r1.11.6.4 dir.mk
74a75
> DIR_CPPFLAGS += -DDLLEXPORT