From 3176b44a88bfe6058159d5a24d160f57e960615c Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Thu, 17 Apr 2003 03:15:58 +0000 Subject: Macro reorg/cleanup --- cpp/src/Slice/CPlusPlusUtil.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp') 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"; } } -- cgit v1.2.3