Bug 424068: Disable Unicode collation on Mac more intelligently. r=jdaggett

This commit is contained in:
Simon Montagu 2008-12-03 00:43:42 -08:00
parent c847d82b0e
commit 2525c14df1
2 changed files with 6 additions and 1 deletions

View File

@ -55,11 +55,14 @@ REQUIRES = xpcom \
CPPSRCS = \
nsCollationMac.cpp \
nsCollationMacUC.cpp \
nsDateTimeFormatMac.cpp \
nsMacLocale.cpp \
$(NULL)
ifdef USE_UCCOLLATIONKEY
CPPSRCS += nsCollationMacUC.cpp
endif
include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/..

View File

@ -69,6 +69,8 @@
#endif
#ifdef USE_MAC_LOCALE
// We currently do not define USE_UCCOLLATIONKEY because it causes crashes.
// See bug 128323 and bug 255192
#ifdef USE_UCCOLLATIONKEY
#include "nsCollationMacUC.h"
#else