More necko ifdefs.

htmlparser/src/makefile.win

@@ -122,7 +122,15 @@ EXTRA_EXPORTS=					\
 	nsHTMLTags.h				\
 	$(NULL)
 
-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\netlib -I$(PUBLIC)\uconv -I$(PUBLIC)\expat
+LINCS=  -I$(PUBLIC)\xpcom  \
+        -I$(PUBLIC)\raptor \
+!ifdef NECKO
+        -I$(PUBLIC)\necko  \
+!else
+        -I$(PUBLIC)\netlib \
+!endif
+        -I$(PUBLIC)\uconv  \
+        -I$(PUBLIC)\expat
 
 MAKE_OBJ_TYPE = DLL
 DLLNAME = raptorhtmlpars
@@ -138,6 +146,9 @@ LLIBS=        \
  $(DIST)\lib\xpcom.lib  \
  $(DIST)\lib\plc3.lib       \
  $(DIST)\lib\expat.lib			\
+!ifdef NECKO
+ $(DIST)\lib\neckoutil_s.lib			\
+!endif
  $(LIBNSPR)  
 
 !ifdef MOZ_NO_DEBUG_RTL

htmlparser/src/nsExpatTokenizer.cpp

@@ -32,12 +32,12 @@
 
 #include "prmem.h"
 #include "nsIUnicharInputStream.h"
-#include "nsINetService.h"
-#include "nsIServiceManager.h"
-
 #ifdef NECKO
 #include "nsNeckoUtil.h"
+#else
+#include "nsINetService.h"
 #endif
+#include "nsIServiceManager.h"
 
  /************************************************************************
   And now for the main class -- nsExpatTokenizer...
@@ -47,8 +47,10 @@ static NS_DEFINE_IID(kISupportsIID,       NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kITokenizerIID,      NS_ITOKENIZER_IID);
 static NS_DEFINE_IID(kHTMLTokenizerIID,   NS_HTMLTOKENIZER_IID);
 static NS_DEFINE_IID(kClassIID,           NS_EXPATTOKENIZER_IID);
+#ifndef NECKO
 static NS_DEFINE_IID(kNetServiceCID,      NS_NETSERVICE_CID);
 static NS_DEFINE_IID(kINetServiceIID,     NS_INETSERVICE_IID);
+#endif
 
 
 static CTokenRecycler* gTokenRecycler=0;

parser/htmlparser/src/makefile.win

@@ -122,7 +122,15 @@ EXTRA_EXPORTS=					\
 	nsHTMLTags.h				\
 	$(NULL)
 
-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\netlib -I$(PUBLIC)\uconv -I$(PUBLIC)\expat
+LINCS=  -I$(PUBLIC)\xpcom  \
+        -I$(PUBLIC)\raptor \
+!ifdef NECKO
+        -I$(PUBLIC)\necko  \
+!else
+        -I$(PUBLIC)\netlib \
+!endif
+        -I$(PUBLIC)\uconv  \
+        -I$(PUBLIC)\expat
 
 MAKE_OBJ_TYPE = DLL
 DLLNAME = raptorhtmlpars
@@ -138,6 +146,9 @@ LLIBS=        \
  $(DIST)\lib\xpcom.lib  \
  $(DIST)\lib\plc3.lib       \
  $(DIST)\lib\expat.lib			\
+!ifdef NECKO
+ $(DIST)\lib\neckoutil_s.lib			\
+!endif
  $(LIBNSPR)  
 
 !ifdef MOZ_NO_DEBUG_RTL

parser/htmlparser/src/nsExpatTokenizer.cpp

@@ -32,12 +32,12 @@
 
 #include "prmem.h"
 #include "nsIUnicharInputStream.h"
-#include "nsINetService.h"
-#include "nsIServiceManager.h"
-
 #ifdef NECKO
 #include "nsNeckoUtil.h"
+#else
+#include "nsINetService.h"
 #endif
+#include "nsIServiceManager.h"
 
  /************************************************************************
   And now for the main class -- nsExpatTokenizer...
@@ -47,8 +47,10 @@ static NS_DEFINE_IID(kISupportsIID,       NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kITokenizerIID,      NS_ITOKENIZER_IID);
 static NS_DEFINE_IID(kHTMLTokenizerIID,   NS_HTMLTOKENIZER_IID);
 static NS_DEFINE_IID(kClassIID,           NS_EXPATTOKENIZER_IID);
+#ifndef NECKO
 static NS_DEFINE_IID(kNetServiceCID,      NS_NETSERVICE_CID);
 static NS_DEFINE_IID(kINetServiceIID,     NS_INETSERVICE_IID);
+#endif
 
 
 static CTokenRecycler* gTokenRecycler=0;