diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLPluginI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/icecpp/config.h | 18 |
2 files changed, 14 insertions, 6 deletions
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp index bc44862e5b8..8a33909cef0 100644 --- a/cpp/src/IceSSL/OpenSSLPluginI.cpp +++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp @@ -147,7 +147,7 @@ idFunction() { #if defined(_WIN32) return static_cast<unsigned long>(GetCurrentThreadId()); -#elif defined(__FreeBSD__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(__osf1__) // // On FreeBSD, pthread_t is a pointer to a per-thread structure // diff --git a/cpp/src/icecpp/config.h b/cpp/src/icecpp/config.h index 7c24464cf34..3b1a07787f6 100644 --- a/cpp/src/icecpp/config.h +++ b/cpp/src/icecpp/config.h @@ -12,8 +12,9 @@ // configure script from the gcc-2.8.1 distribution. // -#if defined(__linux) || defined(__FreeBSD__) || defined(__sun) || defined(__hpux) || defined(__APPLE__) || defined(_AIX) -# define HAVE_INTTYPES_H 1 +#if defined(__linux) || defined(__FreeBSD__) || defined(__sun) || \ + defined(__hpux) || defined(__APPLE__) || defined(_AIX) || \ + defined(__osf1__) # define TIME_WITH_SYS_TIME 1 # define HAVE_BCMP 1 # define HAVE_BCOPY 1 @@ -30,11 +31,16 @@ # define alloca _alloca #endif +#if defined(__linux) || defined(__FreeBSD__) || defined(__sun) || \ + defined(__hpux) || defined(__APPLE__) || defined(_AIX) +# define HAVE_INTTYPES_H 1 +#endif + #if defined(__hpux) || defined(_AIX) #include <alloca.h> #endif -#if defined(__sun) +#if defined(__sun) || defined(__osf1__) #include <alloca.h> #include <malloc.h> #include <strings.h> @@ -56,8 +62,10 @@ #define LONG_TYPE_SIZE 4 #if defined(_WIN32) # define WCHAR_TYPE_SIZE 2 -#elif (defined(__linux) || defined(__FreeBSD__)) && (defined(__i386) || defined(__x86_64) || defined(__sparc)) \ - || defined (__sun) || defined(__hpux) || defined(__APPLE__) || defined(_AIX) +#elif (defined(__linux) || defined(__FreeBSD__)) && \ + (defined(__i386) || defined(__x86_64) || defined(__sparc)) || \ + defined (__sun) || defined(__hpux) || defined(__APPLE__) || \ + defined(_AIX) || defined(__osf1__) # define WCHAR_TYPE_SIZE 4 #else # error "unsupported operating system or platform" |