Bug 498324 - Network layer support for Symbian emulator. r=bzbarsky, sr=cbiesinger
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 19 Jun 2009 16:11:32 +0900
changeset 29348 6106c4a9f080747f2e4e7edfc3a111ae2d8f13ed
parent 29347 592ca03298273cca07dc9d0cc52dbdaffaee2f86
child 29349 3ed492a26551826fa535230ef445b9a8494dfa20
push idunknown
push userunknown
push dateunknown
reviewersbzbarsky, cbiesinger
bugs498324
milestone1.9.2a1pre
Bug 498324 - Network layer support for Symbian emulator. r=bzbarsky, sr=cbiesinger
netwerk/protocol/file/src/nsFileProtocolHandler.cpp
netwerk/streamconv/converters/ParseFTPList.cpp
--- a/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
+++ b/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
@@ -187,17 +187,17 @@ nsFileProtocolHandler::ReadURLFile(nsIFi
         }
         NS_Free(buffer);
     }
     PR_Close(file);
 
     return rv;
 }
 
-#elif defined(XP_UNIX)
+#elif defined(XP_UNIX) && !defined(__SYMBIAN32__)
 NS_IMETHODIMP
 nsFileProtocolHandler::ReadURLFile(nsIFile* aFile, nsIURI** aURI)
 {
     // We only support desktop files that end in ".desktop" like the spec says:
     // http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s02.html
     nsCAutoString leafName;
     nsresult rv = aFile->GetNativeLeafName(leafName);
     if (NS_FAILED(rv) ||
--- a/netwerk/streamconv/converters/ParseFTPList.cpp
+++ b/netwerk/streamconv/converters/ParseFTPList.cpp
@@ -34,17 +34,17 @@
  * 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 ***** */
 
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <plstr.h>
+#include "plstr.h"
 
 #include "ParseFTPList.h"
 
 /* ==================================================================== */
 
 int ParseFTPList(const char *line, struct list_state *state,
                  struct list_result *result )
 {