diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-09 18:16:00 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-09 18:16:00 +0200 |
| commit | 657439e9c232c0f672891f604cc21892434961bf (patch) | |
| tree | 466c5ddf47e4338bed1637840ca0bbfe6e21a53d /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | Fix for ICE-7132 - Missing -DICE_STATIC_LIBS (diff) | |
| download | ice-657439e9c232c0f672891f604cc21892434961bf.tar.bz2 ice-657439e9c232c0f672891f604cc21892434961bf.tar.xz ice-657439e9c232c0f672891f604cc21892434961bf.zip | |
Another fix for ICE-7132
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 20b4f22fb7e..8197c7612c8 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -433,10 +433,10 @@ Slice::printDllExportStuff(Output& out, const string& dllExport) { out << sp; out << "\n#ifndef " << dllExport; - out << "\n# ifdef " << dllExport << "_EXPORTS"; - out << "\n# define " << dllExport << " ICE_DECLSPEC_EXPORT"; - out << "\n# elif defined(ICE_STATIC_LIBS)"; + out << "\n# if defined(ICE_STATIC_LIBS)"; out << "\n# define " << dllExport << " /**/"; + out << "\n# elif defined(" << dllExport << "_EXPORTS)"; + out << "\n# define " << dllExport << " ICE_DECLSPEC_EXPORT"; out << "\n# else"; out << "\n# define " << dllExport << " ICE_DECLSPEC_IMPORT"; out << "\n# endif"; |