316888 - Camino builds failing in PreferenceManager.mm, Xcode 2.2 and SDK >= 10.3.9

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[Mark Mentovai]

Seems like there were a few changes to the SDKs in Xcode 2.2.  Camino builds are failing in PreferenceManager.mm because kSCPropNetProxiesProxyAutoConfigEnable and friends are macros defined in the SDK as CFSTR(...), so

static NSString* const kSCPropNetProxiesProxyAutoConfigEnable    = @"ProxyAutoC
onfigEnable";

actually winds up expanding to something like

static NSString* const ((CFStringRef) __builtin___CFStringMakeConstantString (""
 "ProxyAutoConfigEnable" "")) = @"ProxyAutoConfigEnable";

That's clearly very wrong.

Of the three constants defined at http://lxr.mozilla.org/mozilla/source/camino/src/preferences/PreferenceManager.mm#80, all are defined in the 10.4 SDK, and the first two are defined in the 10.3 SDK.

There's no fantastic reliable way of handling this other than using our own custom constants all the way, overriding the #defines.  This patch does that whenever the DT < 10.4.  DTs >= 10.4 (currently only Intel builds) will use the SDK's definitions, which will either be #defines or externs relying on runtime linkage.

Comment 1

[Mark Mentovai]

Attachment: Fix

Comment 2

[Mark Mentovai]

Trunk 'n' branch.