diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-04-17 03:15:58 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-04-17 03:15:58 +0000 |
| commit | 3176b44a88bfe6058159d5a24d160f57e960615c (patch) | |
| tree | cb3ed89fa04355aec4433687b9a6dc81528cbd31 /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | file FactoryTableDef.cpp was initially added on branch slicing. (diff) | |
| download | ice-3176b44a88bfe6058159d5a24d160f57e960615c.tar.bz2 ice-3176b44a88bfe6058159d5a24d160f57e960615c.tar.xz ice-3176b44a88bfe6058159d5a24d160f57e960615c.zip | |
Macro reorg/cleanup
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 1baee9853e6..2b3834ac072 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -101,14 +101,12 @@ Slice::printDllExportStuff(Output& out, const string& dllExport) if(dllExport.size()) { out << sp; - out << "\n#ifdef _WIN32"; + out << "\n#ifndef " << dllExport; out << "\n# ifdef " << dllExport << "_EXPORTS"; - out << "\n# define " << dllExport << " __declspec(dllexport)"; + out << "\n# define " << dllExport << " ICE_DECLSPEC_EXPORT"; out << "\n# else"; - out << "\n# define " << dllExport << " __declspec(dllimport)"; + out << "\n# define " << dllExport << " ICE_DECLSPEC_IMPORT"; out << "\n# endif"; - out << "\n#else"; - out << "\n# define " << dllExport << " /**/"; out << "\n#endif"; } } |