Support system proxy settings on OS X, fixing bustage (bug 125995)
authorRobert O'Callahan <robert@ocallahan.org>
Thu, 12 Jun 2008 15:29:39 +1200
changeset 15329 e3a4c136455bcd2c20867c709ac546527583c1ef
parent 15328 745e0f997344b15f57ca760b39a7856487b4ba7e
child 15330 103f04f54b143d22bceb0b97e2eafba572f7a54d
push idunknown
push userunknown
push dateunknown
bugs125995
milestone1.9.1a1pre
Support system proxy settings on OS X, fixing bustage (bug 125995)
toolkit/system/osxproxy/Makefile.in
toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@@ -66,14 +66,9 @@ FRAMEWORKS += \
 OS_LIBS += $(FRAMEWORKS)
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 CMMSRCS = \
         nsOSXSystemProxySettings.mm \
         $(NULL)
 
-LOCAL_INCLUDES = \
-    -I/System/Library/Frameworks/Cocoa.framework/Headers \
-    -I/System/Library/Frameworks/SystemConfiguration.framework/Headers \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
+++ b/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
@@ -37,19 +37,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #import <Cocoa/Cocoa.h>
-#import <CoreFoundation/CoreFoundation.h>
-#import <CFError.h>
-#import <SystemConfiguration.h>
+#import <SystemConfiguration/SystemConfiguration.h>
 
 #include "nsISystemProxySettings.h"
 #include "nsIGenericFactory.h"
 #include "nsIServiceManager.h"
 #include "nsPrintfCString.h"
 #include "nsNetUtil.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIURI.h"