summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2001-01-30 01:56:14 +0000
committerwtc%netscape.com <devnull@localhost>2001-01-30 01:56:14 +0000
commit6a68af3ce3c94e501b2a659a54f582facc9ed8d2 (patch)
tree37913464ff4d0b9b224d062dd63a639c9be8e797
parent5a2ad3aec0c53ecedfbdba137fb87b9aea83ff07 (diff)
downloadnss-hg-6a68af3ce3c94e501b2a659a54f582facc9ed8d2.tar.gz
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. (NSS_3_1_BRANCH)
-rw-r--r--security/nss/lib/util/unix_rand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/nss/lib/util/unix_rand.c b/security/nss/lib/util/unix_rand.c
index 472f18197..625f30d4b 100644
--- a/security/nss/lib/util/unix_rand.c
+++ b/security/nss/lib/util/unix_rand.c
@@ -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)
@@ -700,7 +700,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";