diff options
| author | Marc Laukien <marc@zeroc.com> | 2003-02-23 21:01:17 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2003-02-23 21:01:17 +0000 |
| commit | c10d2ade46fbcf0f7ebbe3200f98e58e2d72f63e (patch) | |
| tree | 85dce5f1ae7718d4f50a52c585c18ae04c38591f /cpp/src | |
| parent | fix (diff) | |
| download | ice-c10d2ade46fbcf0f7ebbe3200f98e58e2d72f63e.tar.bz2 ice-c10d2ade46fbcf0f7ebbe3200f98e58e2d72f63e.tar.xz ice-c10d2ade46fbcf0f7ebbe3200f98e58e2d72f63e.zip | |
more compat fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePack/ActivatorI.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/Slice/GrammarUtil.h | 2 | ||||
| -rw-r--r-- | cpp/src/icecpp/config.h | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp index 4ced9395b2e..a7ed12912b4 100644 --- a/cpp/src/IcePack/ActivatorI.cpp +++ b/cpp/src/IcePack/ActivatorI.cpp @@ -541,10 +541,17 @@ IcePack::ActivatorI::terminationListener() if(ret == -1) { +#ifdef EPROTO if(errno == EINTR || errno == EPROTO) { goto repeatSelect; } +#else + if(errno == EINTR) + { + goto repeatSelect; + } +#endif SyscallException ex(__FILE__, __LINE__); ex.error = getSystemErrno(); diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h index 27d79614ca5..ea89bacd7bb 100644 --- a/cpp/src/Slice/GrammarUtil.h +++ b/cpp/src/Slice/GrammarUtil.h @@ -114,7 +114,7 @@ class SLICE_API FloatingTok : public GrammarBase public: FloatingTok() { } - Double v; + double v; }; // ---------------------------------------------------------------------- diff --git a/cpp/src/icecpp/config.h b/cpp/src/icecpp/config.h index 4430fd113bf..1c13ee2855a 100644 --- a/cpp/src/icecpp/config.h +++ b/cpp/src/icecpp/config.h @@ -17,7 +17,7 @@ // configure script from the gcc-2.8.1 distribution. // -#if defined(__linux__) +#if defined(__linux__) || defined(__FreeBSD__) # define HAVE_INTTYPES_H 1 # define TIME_WITH_SYS_TIME 1 # define HAVE_BCMP 1 @@ -51,7 +51,7 @@ #define LONG_TYPE_SIZE 4 #if defined(_WIN32) # define WCHAR_TYPE_SIZE 2 -#elif defined(__linux__) && defined(i386) +#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(i386) # define WCHAR_TYPE_SIZE 4 #else # error "unsupported operating system or platform" |