diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-07-28 12:22:51 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-07-28 12:22:51 -0400 |
| commit | 309197cf1f87f0b3b74308741626a59447d817a5 (patch) | |
| tree | 2cf86f9bafbedb53f41375e30bab9066d5a68310 /cpp | |
| parent | Fixed ICE-5602 - IceGrid/replication test failure on Windows (diff) | |
| download | ice-309197cf1f87f0b3b74308741626a59447d817a5.tar.bz2 ice-309197cf1f87f0b3b74308741626a59447d817a5.tar.xz ice-309197cf1f87f0b3b74308741626a59447d817a5.zip | |
Correct __declspec for MinGW
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.MINGW | 2 | ||||
| -rw-r--r-- | cpp/include/Ice/Format.h | 2 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 5 | ||||
| -rw-r--r-- | cpp/include/Slice/Parser.h | 6 |
4 files changed, 7 insertions, 8 deletions
diff --git a/cpp/config/Make.rules.MINGW b/cpp/config/Make.rules.MINGW index 0ef68201739..6de669c684e 100644 --- a/cpp/config/Make.rules.MINGW +++ b/cpp/config/Make.rules.MINGW @@ -18,7 +18,7 @@ ifeq ($(CXX),) CXX = c++ endif -CXXFLAGS = $(CXXARCHFLAGS) -mthreads -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Werror -DWIN32_LEAN_AND_MEAN +CXXFLAGS = $(CXXARCHFLAGS) -mthreads -fvisibility=hidden -Wall -Werror -DWIN32_LEAN_AND_MEAN LDFLAGS = -Wl,-no-undefined ifeq ($(CXX), i686-pc-mingw32-c++) diff --git a/cpp/include/Ice/Format.h b/cpp/include/Ice/Format.h index 80f025f216d..30d858eed97 100644 --- a/cpp/include/Ice/Format.h +++ b/cpp/include/Ice/Format.h @@ -18,7 +18,7 @@ namespace Ice // // This enumeration describes the possible formats for classes and exceptions. // -enum ICE_API FormatType +enum FormatType { // // Indicates that no preference was specified. diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index bd965135005..866e6147c38 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -114,10 +114,9 @@ // // Compiler extensions to export and import symbols: see the documentation -// for Visual C++, Solaris Studio and HP aC++. +// for Visual Studio, Solaris Studio and GCC. // -#if (defined(_MSC_VER) && !defined(ICE_STATIC_LIBS)) || \ - (defined(__HP_aCC) && defined(__HP_WINDLL)) +#if defined(_WIN32) && !defined(ICE_STATIC_LIBS) # define ICE_DECLSPEC_EXPORT __declspec(dllexport) # define ICE_DECLSPEC_IMPORT __declspec(dllimport) // diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index f4a6da1498a..0b70f236476 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -57,13 +57,13 @@ const IceUtil::Int64 Int16Min = -Int16Max - 1; const IceUtil::Int64 ByteMax = 0xff; const IceUtil::Int64 ByteMin = 0x00; -enum SLICE_API FeatureProfile +enum FeatureProfile { Ice, IceE }; -enum SLICE_API NodeType +enum NodeType { Dummy, Real @@ -72,7 +72,7 @@ enum SLICE_API NodeType // // Format preference for classes and exceptions. // -enum SLICE_API FormatType +enum FormatType { DefaultFormat, // No preference was specified. CompactFormat, // Minimal format. |