diff options
| author | Jose <jose@zeroc.com> | 2019-02-07 18:43:12 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-02-07 21:02:19 +0100 |
| commit | 065e5f80067bf8ab72077039d5414d9383565a01 (patch) | |
| tree | 1c6f0217cf1a9ea62ec8e31a51317de8e6bfc642 /cpp/src/IceGrid/Activator.cpp | |
| parent | Amazon Linux is now amzn2 (diff) | |
| download | ice-065e5f80067bf8ab72077039d5414d9383565a01.tar.bz2 ice-065e5f80067bf8ab72077039d5414d9383565a01.tar.xz ice-065e5f80067bf8ab72077039d5414d9383565a01.zip | |
Fix macros for Linux OS detection
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 052939a377b..7982685b1f1 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -32,7 +32,7 @@ #endif #endif -#if defined(__linux) || defined(__sun) || defined(_AIX) || defined(__GLIBC__) +#if defined(__linux__) || defined(__sun) || defined(_AIX) || defined(__GLIBC__) # include <grp.h> // for setgroups #endif @@ -1413,7 +1413,7 @@ Activator::waitPid(pid_t processPid) try { int status; -#if defined(__linux) +#if defined(__linux__) int nRetry = 0; while(true) // The while loop is necessary for the linux workaround. { |