diff options
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/DynamicLibrary.h | 1 | ||||
| -rw-r--r-- | cpp/include/IceUtil/FileUtil.h | 2 | ||||
| -rw-r--r-- | cpp/include/Makefile | 21 | ||||
| -rw-r--r-- | cpp/include/Slice/Parser.h | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h index 3e4d6e1c257..dd1aa9f9526 100644 --- a/cpp/include/Ice/DynamicLibrary.h +++ b/cpp/include/Ice/DynamicLibrary.h @@ -86,7 +86,6 @@ private: #else void* _hnd; #endif - std::string _err; const Ice::StringConverterPtr _stringConverter; }; diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index 666ea5ec6a7..054a8c9fef0 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -38,7 +38,7 @@ ICE_UTIL_API bool directoryExists(const std::string&); #ifdef _WIN32 -#if (defined(_MSC_VER) && (_MSC_VER < 1300)) +#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) typedef struct _stat structstat; #else typedef struct _stat64i32 structstat; diff --git a/cpp/include/Makefile b/cpp/include/Makefile index e0cc01b3c42..5de48e060d4 100644 --- a/cpp/include/Makefile +++ b/cpp/include/Makefile @@ -11,17 +11,22 @@ top_srcdir = .. include $(top_srcdir)/config/Make.rules -SUBDIRS = Freeze \ - Glacier2 \ - Ice \ - IceBox \ - IceGrid \ - IcePatch2 \ +SUBDIRS = Ice \ IceSSL \ - IceStorm \ IceUtil \ - IceXML \ Slice + +ifneq ($(MinGW), yes) +SUBDIRS := $(SUBDIRS) \ + Freeze \ + Glacier2 \ + IceBox \ + IceGrid \ + IcePatch2 \ + IceStorm \ + IceXML +endif + $(EVERYTHING):: @for subdir in $(SUBDIRS); \ diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index 1075caa7e1a..6c5a4f5d75b 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -30,7 +30,7 @@ namespace Slice { -#if defined(_WIN32) +#if defined(_WIN32) && !defined(__MINGW32__) const IceUtil::Int64 Int32Max = 0x7fffffffi64; const IceUtil::Int64 Int32Min = -Int32Max - 1i64; |