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/slice2objc/Gen.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/slice2objc/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2objc/Gen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index e63b4ec5806..de42c632ca8 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -784,10 +784,10 @@ Slice::Gen::generate(const UnitPtr& p) _H << nl; _H << nl << "#ifndef " << _dllExport; - _H << nl << "# ifdef " << _dllExport << "_EXPORTS"; - _H << nl << "# define " << _dllExport << " ICE_DECLSPEC_EXPORT"; - _H << nl << "# elif defined(ICE_STATIC_LIBS)"; + _H << nl << "# if defined(ICE_STATIC_LIBS)"; _H << nl << "# define " << _dllExport << " /**/"; + _H << nl << "# elif defined(" << _dllExport << "_EXPORTS)"; + _H << nl << "# define " << _dllExport << " ICE_DECLSPEC_EXPORT"; _H << nl << "# else"; _H << nl << "# define " << _dllExport << " ICE_DECLSPEC_IMPORT"; _H << nl << "# endif"; @@ -1633,7 +1633,7 @@ Slice::Gen::TypesVisitor::writeConstantValue(IceUtilInternal::Output& out, const break; } } - + out << val[i]; // Print normally if in basic source character set } ++i; |