diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /cpp/include/Ice/Config.h | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
Merge branch 'master' into encoding11
Conflicts:
CHANGES
cpp/src/Ice/EndpointI.cpp
cpp/src/Ice/TcpConnector.cpp
cpp/src/Ice/TcpConnector.h
cpp/src/Ice/UdpConnector.cpp
cpp/src/Ice/UdpConnector.h
Diffstat (limited to 'cpp/include/Ice/Config.h')
| -rw-r--r-- | cpp/include/Ice/Config.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index 79cecd3336e..5322bb31717 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -22,12 +22,14 @@ #include <vector> #include <map> -#if defined(_WIN32) -# include <process.h> -#else -# include <sys/types.h> -# include <unistd.h> -# include <cstddef> +#ifndef ICE_OS_WINRT +# if defined(_WIN32) +# include <process.h> +# else +# include <sys/types.h> +# include <unistd.h> +# include <cstddef> +# endif #endif // |