From 3a22049deee02ed2597100173faae7efe2471eca Mon Sep 17 00:00:00 2001 From: "kaie%kuix.de" Date: Wed, 12 Dec 2012 12:30:51 +0000 Subject: [PATCH] Bug 820374, comment and whitespace cleanup, addressing wtc's review comments for the earlier bustage fix git-svn-id: svn://10.0.0.236/trunk@264548 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/sqlite/config.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mozilla/security/nss/lib/sqlite/config.mk b/mozilla/security/nss/lib/sqlite/config.mk index 3971b9f03b5..c7b93ed3910 100644 --- a/mozilla/security/nss/lib/sqlite/config.mk +++ b/mozilla/security/nss/lib/sqlite/config.mk @@ -35,11 +35,13 @@ ifeq ($(OS_TARGET),Darwin) # version numbers, so we use the same to be compatible. DARWIN_DYLIB_VERSIONS = -compatibility_version 9 -current_version 9.6 -# Required for Mac OSX 10.4 PowerPC, see bug 820374 +# The SQLite code that uses the Apple zone allocator calls +# OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5 +# (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable +# that code for older versions of Mac OS X. See bug 820374. DARWIN_VER_MAJOR := $(shell uname -r | cut -f1 -d.) DARWIN_LT_9 := $(shell [ $(DARWIN_VER_MAJOR) -lt 9 ] && echo true) ifeq ($(DARWIN_LT_9),true) OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC endif - -endif +endif # Darwin