diff options
author | wtc <devnull@localhost> | 1998-04-28 23:54:29 +0000 |
---|---|---|
committer | wtc <devnull@localhost> | 1998-04-28 23:54:29 +0000 |
commit | d32f0e7e8878fee0d211e85e33886ef86b963144 (patch) | |
tree | b1f9836b2eb59f16f74eaffd9af364d50ca69aa5 | |
parent | c6d8300952bf5b808ef70c986a7351d0a33804c1 (diff) | |
parent | ba92e173e2a54f5ac0aeac5176343f264a01d1b4 (diff) | |
download | nspr-hg-d32f0e7e8878fee0d211e85e33886ef86b963144.tar.gz |
Got rid of the LINUX1_2 and LINUX2_0 macros. I hope that this will
make building on 2.1.x easier. In case we need to distinguish between
different versions of Linux, we will try to use feature-based macros
as opposed to version-based macros.
Files changed: Linux.mk, _linux.h, _pth.h, prnetdb.c, and ptthread.c.
-rw-r--r-- | config/Linux.mk | 16 | ||||
-rw-r--r-- | pr/include/md/_linux.h | 5 | ||||
-rw-r--r-- | pr/include/md/_pth.h | 2 | ||||
-rw-r--r-- | pr/src/misc/prnetdb.c | 4 | ||||
-rw-r--r-- | pr/src/pthreads/ptthread.c | 2 |
5 files changed, 8 insertions, 21 deletions
diff --git a/config/Linux.mk b/config/Linux.mk index 1189096f..eb89c86f 100644 --- a/config/Linux.mk +++ b/config/Linux.mk @@ -59,18 +59,15 @@ OS_CFLAGS = $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS) ###################################################################### ifeq ($(CPU_ARCH),alpha) -PLATFORM_FLAGS += -DLINUX1_2 -D_ALPHA_ -D__alpha +PLATFORM_FLAGS += -D_ALPHA_ -D__alpha PORT_FLAGS += -D_XOPEN_SOURCE endif ifeq ($(CPU_ARCH),ppc) -PLATFORM_FLAGS += -DMKLINUX -DLINUX1_2 +PLATFORM_FLAGS += -DMKLINUX OS_INCLUDES += -I/usr/local/include endif -ifeq ($(CPU_ARCH),sparc) -PLATFORM_FLAGS += -DLINUX1_2 -endif ifeq ($(CPU_ARCH),x86) -PLATFORM_FLAGS += -mno-486 -DLINUX1_2 -Di386 +PLATFORM_FLAGS += -mno-486 -Di386 PORT_FLAGS += -D_XOPEN_SOURCE endif ifeq ($(CPU_ARCH),m68k) @@ -82,12 +79,7 @@ ifeq ($(CPU_ARCH),m68k) ifndef BUILD_OPT OPTIMIZER += -O endif -PLATFORM_FLAGS += -m68020-40 -DLINUX1_2 -endif - -# These are CPU_ARCH independent -ifeq ($(basename $(OS_RELEASE)),2.0) -PLATFORM_FLAGS += -DLINUX2_0 +PLATFORM_FLAGS += -m68020-40 endif # diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h index a7ac6326..756edbab 100644 --- a/pr/include/md/_linux.h +++ b/pr/include/md/_linux.h @@ -48,13 +48,8 @@ /* * Elf linux supports dl* functions */ -#if defined(LINUX1_2) || defined(LINUX2_0) #define HAVE_DLL #define USE_DLFCN -#else -#undef HAVE_DLL -#undef USE_DLFCN -#endif #if !defined(MKLINUX) && !defined(NEED_TIME_R) #define NEED_TIME_R diff --git a/pr/include/md/_pth.h b/pr/include/md/_pth.h index bf0be7f7..bb70ee02 100644 --- a/pr/include/md/_pth.h +++ b/pr/include/md/_pth.h @@ -141,7 +141,7 @@ PR_EXTERN(PRIntn) pt_hpux_privcheck(void); /* * These platforms don't have sigtimedwait() */ -#if (defined(AIX) && !defined(AIX4_3)) || defined(LINUX2_0) \ +#if (defined(AIX) && !defined(AIX4_3)) || defined(LINUX) \ || defined(FREEBSD) #define PT_NO_SIGTIMEDWAIT #endif diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c index 74bf7aba..1c64ca6f 100644 --- a/pr/src/misc/prnetdb.c +++ b/pr/src/misc/prnetdb.c @@ -72,7 +72,7 @@ static sigset_t timer_set; */ #if defined(SOLARIS) \ - || (defined(LINUX2_0) && defined(_REENTRANT) \ + || (defined(LINUX) && defined(_REENTRANT) \ && !(defined(__GLIBC__) && __GLIBC__ >= 2)) #define _PR_HAVE_GETPROTO_R #define _PR_HAVE_GETPROTO_R_POINTER @@ -86,7 +86,7 @@ static sigset_t timer_set; #define _PR_HAVE_GETPROTO_R_INT #endif -#if (defined(LINUX2_0) && defined(__GLIBC__) && __GLIBC__ >= 2) +#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) #define _PR_HAVE_GETPROTO_R #define _PR_HAVE_5_ARG_GETPROTO_R #endif diff --git a/pr/src/pthreads/ptthread.c b/pr/src/pthreads/ptthread.c index d555c9fd..5ff9e177 100644 --- a/pr/src/pthreads/ptthread.c +++ b/pr/src/pthreads/ptthread.c @@ -751,7 +751,7 @@ void _PR_InitThreads( * conflict with the use of these two signals in our GC support. * So we don't know how to support GC on Linux pthreads. */ -#if !defined(LINUX2_0) && !defined(FREEBSD) +#if !defined(LINUX) && !defined(FREEBSD) init_pthread_gc_support(); #endif |