Bugzilla bug #63935: use our own macro LINUX instead of the compiler
predefined macro __linux as __linux is not defined by some compilers. Thanks to jsmith@penguinppc.org for the bug report and a suggested fix. git-svn-id: svn://10.0.0.236/trunk@85697 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
5bcca241df
commit
ac41e872c6
@ -262,7 +262,7 @@ GiveSystemInfo(void)
|
||||
}
|
||||
#endif /* IBM R2 */
|
||||
|
||||
#if defined(__linux)
|
||||
#if defined(LINUX)
|
||||
#include <linux/kernel.h>
|
||||
|
||||
static size_t
|
||||
@ -283,7 +283,7 @@ GiveSystemInfo(void)
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif /* __linux */
|
||||
#endif /* LINUX */
|
||||
|
||||
#if defined(NCR)
|
||||
|
||||
@ -741,7 +741,7 @@ void RNG_SystemInfoForRNG(void)
|
||||
#ifdef DO_PS
|
||||
For now it is considered that it is too expensive to run the ps command
|
||||
for the small amount of entropy it provides.
|
||||
#if defined(__sun) && (!defined(__svr4) && !defined(SVR4)) || defined(bsdi) || defined(__linux)
|
||||
#if defined(__sun) && (!defined(__svr4) && !defined(SVR4)) || defined(bsdi) || defined(LINUX)
|
||||
static char ps_cmd[] = "ps aux";
|
||||
#else
|
||||
static char ps_cmd[] = "ps -el";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user