Bugzilla Bug 361076: removed code that handled multiple NSPR threading

implementations.  We only use the pthreads-based implementation now.
r=christophe.ravel.
This commit is contained in:
wtchang%redhat.com 2006-11-17 21:57:14 +00:00
parent 37d9e7922d
commit a31821060f

View File

@ -41,7 +41,6 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk
# Temporary define for the Client; to be removed when binary release is used
#
ifdef MOZILLA_CLIENT
LOCAL_THREADS_ONLY = 1
ifndef NS_USE_NATIVE
NS_USE_GCC = 1
endif
@ -72,24 +71,6 @@ else
endif
endif
#
# The default implementation strategy for Solaris is classic nspr.
#
ifeq ($(USE_PTHREADS),1)
IMPL_STRATEGY = _PTH
else
ifeq ($(LOCAL_THREADS_ONLY),1)
IMPL_STRATEGY = _LOCAL
endif
endif
#
# Temporary define for the Client; to be removed when binary release is used
#
ifdef MOZILLA_CLIENT
IMPL_STRATEGY =
endif
DEFAULT_COMPILER = cc
ifdef NS_USE_GCC
@ -124,11 +105,7 @@ INCLUDES += -I/usr/dt/include -I/usr/openwin/include
RANLIB = echo
CPU_ARCH = sparc
OS_DEFINES += -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS
ifneq ($(LOCAL_THREADS_ONLY),1)
OS_DEFINES += -D_REENTRANT
endif
OS_DEFINES += -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS -D_REENTRANT
# Purify doesn't like -MDupdate
NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)