diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-07 11:36:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-07 11:36:01 +0000 |
| commit | 42502c8484cd0aef4732cc33fdc4b9a5a333a1f8 (patch) | |
| tree | afec9ffc8945e597b85cd5b8de6140fc82a546ce | |
| parent | 6c335f5754ec1aee70cdba2d332e9cece17a7565 (diff) | |
|| -> &&
| -rw-r--r-- | sal/osl/unx/system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c index d1fc724e5f0f..bf8607ddb18f 100644 --- a/sal/osl/unx/system.c +++ b/sal/osl/unx/system.c @@ -201,11 +201,11 @@ int macxp_resolveAlias(char *path, int buflen) #endif /* NO_PTHREAD_RTL */ -#if defined(LINUX) && defined (__GLIBC__) && __GLIBC__ == 2 || __GLIBC_MINOR__ < 4 +#if defined(LINUX) && defined (__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 4 /* The linux kernel 2.4 getpid implemention always return the pid of the thread subprocess and not of the main process, the NPTL implementation with a Linux kernel 2.6 kernel return the pid. So when possibly - their is the wrong implementation of getpid, we save the pid at startup. + there is the wrong implementation of getpid, we save the pid at startup. FIXME: when our Linux base-line is above: + Linux kernel version 2.6 or higher; -> clone() for NTPL + glibc2 version 2.4 or higher; -> No longer LinuxThreads, only NPTL |