From a10798b53925238eb553c9ed75276dce6b37a325 Mon Sep 17 00:00:00 2001 From: "fur%netscape.com" Date: Wed, 14 Oct 1998 20:27:15 +0000 Subject: [PATCH] Changed uses of cpp macro LINUX to linux. The former was defined by the old build system, but the latter is defined by the compiler. LINUX is not used in autoconf --- js/src/config/Linux_All.mk | 2 +- js/src/jscpucfg.c | 6 ------ js/src/jscpucfg.h | 2 +- js/src/jsosdep.h | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/js/src/config/Linux_All.mk b/js/src/config/Linux_All.mk index 72909e532ccd..f335892559b8 100644 --- a/js/src/config/Linux_All.mk +++ b/js/src/config/Linux_All.mk @@ -35,7 +35,7 @@ CPU_ARCH = x86 endif GFX_ARCH = x -OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DLINUX +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE OS_LIBS = -lm -lc ASFLAGS += -x assembler-with-cpp diff --git a/js/src/jscpucfg.c b/js/src/jscpucfg.c index 144391ac6525..63145bda1d15 100644 --- a/js/src/jscpucfg.c +++ b/js/src/jscpucfg.c @@ -57,12 +57,6 @@ #endif #endif -#ifdef linux -#ifndef LINUX -# error "LINUX is not defined" -#endif -#endif - #ifdef bsdi #ifndef BSDI # error "BSDI is not defined" diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h index 9bbd48c4b9d9..da04c9790ecd 100644 --- a/js/src/jscpucfg.h +++ b/js/src/jscpucfg.h @@ -345,7 +345,7 @@ #define PR_WORDS_PER_DWORD_LOG2 1L -#elif defined(LINUX) +#elif defined(linux) #ifdef __powerpc__ #undef IS_LITTLE_ENDIAN diff --git a/js/src/jsosdep.h b/js/src/jsosdep.h index f95ece96b0bc..5d619bceaf3d 100644 --- a/js/src/jsosdep.h +++ b/js/src/jsosdep.h @@ -62,7 +62,7 @@ JS_END_EXTERN_C #elif defined(IRIX) #define HAVE_LONG_LONG -#elif defined(LINUX) +#elif defined(linux) #undef HAVE_LONG_LONG #elif defined(OSF1)