diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-05-05 19:23:45 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-05-05 19:23:45 -0400 |
| commit | a5bd24845a2720d57a66d81effc59423d723c87c (patch) | |
| tree | 76faa296700b0993deb3aa97323abc904188a681 /cpp/src/Ice/Instance.cpp | |
| parent | minor fixes for purify (diff) | |
| download | ice-a5bd24845a2720d57a66d81effc59423d723c87c.tar.bz2 ice-a5bd24845a2720d57a66d81effc59423d723c87c.tar.xz ice-a5bd24845a2720d57a66d81effc59423d723c87c.zip | |
ICE-6481 pragma comment when building static libraries
On windows with VS, pragma comment is now defined when building only when
ICE_BUILDING_<component-name> is not defined. ICE_BUILDING_<component-name>
is defined automatically when <component-name>_API_EXPORTS is defined. When building
static Ice libraries on Windows, please define
ICE_BUILDING_<component-name-being-built>.
ICE_DECLSPEC_EXPORT and ICE_DECLSPEC_IMPORT are now defined all the time on Windows,
and we define the various _API macros to /**/ when ICE_STATIC_LIBS is defined.
Replaced various direct use of ICE_DECLSPEC_EXPORT/ICE_DECLSPEC_IMPORT by
the correct _API macro.
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 59d2287ac1f..f1c18496a1c 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -74,8 +74,8 @@ using namespace IceInternal; namespace IceUtilInternal { -extern bool ICE_DECLSPEC_IMPORT nullHandleAbort; -extern bool ICE_DECLSPEC_IMPORT printStackTraces; +extern bool ICE_UTIL_API nullHandleAbort; +extern bool ICE_UTIL_API printStackTraces; }; |