Fix websockets-disabled build with an ifdef. rs=mcmanus (No bug)
authorKyle Huey <khuey@kylehuey.com>
Fri, 24 Jun 2011 11:00:46 -0700
changeset 71762 389e9e5cfaee35ba012f0d8090b659cee2d5a0f0
parent 71761 8625f655aeecd626c3029e9a596ff540fc278839
child 71763 94a77bde744b11a64b50895c5c34dbd7cc6c24a9
push id20605
push userkhuey@mozilla.com
push dateSat, 25 Jun 2011 17:13:33 +0000
treeherdermozilla-central@82b9558a9eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fix websockets-disabled build with an ifdef. rs=mcmanus (No bug)
netwerk/build/nsNetModule.cpp
--- a/netwerk/build/nsNetModule.cpp
+++ b/netwerk/build/nsNetModule.cpp
@@ -630,18 +630,20 @@ static void nsNetShutdown()
     
     // Release necko strings
     delete gNetStrings;
     gNetStrings = nsnull;
     
     // Release DNS service reference.
     nsDNSPrefetch::Shutdown();
 
+#ifdef NECKO_PROTOCOL_websocket
     // Release the Websocket Admission Manager
     mozilla::net::nsWebSocketHandler::Shutdown();
+#endif // NECKO_PROTOCOL_websocket
 }
 
 NS_DEFINE_NAMED_CID(NS_IOSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_STREAMTRANSPORTSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_SOCKETTRANSPORTSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_SERVERSOCKET_CID);
 NS_DEFINE_NAMED_CID(NS_SOCKETPROVIDERSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_DNSSERVICE_CID);