зеркало из https://github.com/mozilla/pjs.git
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:
Родитель
afcae1f9e0
Коммит
0bf075b1e2
|
@ -41,7 +41,6 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk
|
||||||
# Temporary define for the Client; to be removed when binary release is used
|
# Temporary define for the Client; to be removed when binary release is used
|
||||||
#
|
#
|
||||||
ifdef MOZILLA_CLIENT
|
ifdef MOZILLA_CLIENT
|
||||||
LOCAL_THREADS_ONLY = 1
|
|
||||||
ifndef NS_USE_NATIVE
|
ifndef NS_USE_NATIVE
|
||||||
NS_USE_GCC = 1
|
NS_USE_GCC = 1
|
||||||
endif
|
endif
|
||||||
|
@ -72,24 +71,6 @@ else
|
||||||
endif
|
endif
|
||||||
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
|
DEFAULT_COMPILER = cc
|
||||||
|
|
||||||
ifdef NS_USE_GCC
|
ifdef NS_USE_GCC
|
||||||
|
@ -124,11 +105,7 @@ INCLUDES += -I/usr/dt/include -I/usr/openwin/include
|
||||||
|
|
||||||
RANLIB = echo
|
RANLIB = echo
|
||||||
CPU_ARCH = sparc
|
CPU_ARCH = sparc
|
||||||
OS_DEFINES += -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS
|
OS_DEFINES += -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS -D_REENTRANT
|
||||||
|
|
||||||
ifneq ($(LOCAL_THREADS_ONLY),1)
|
|
||||||
OS_DEFINES += -D_REENTRANT
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Purify doesn't like -MDupdate
|
# Purify doesn't like -MDupdate
|
||||||
NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
|
NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче