diff --git a/network/cnvts/cvcolor.c b/network/cnvts/cvcolor.c index 752a1cc67a1f..66eee6999480 100644 --- a/network/cnvts/cvcolor.c +++ b/network/cnvts/cvcolor.c @@ -30,7 +30,9 @@ * use to color the different syntactical parts * of the HTML stream */ +#ifndef MODULAR_NETLIB #include "pa_parse.h" +#endif #include "xpgetstr.h" #include "intl_csi.h" #define VIEW_SOURCE_TARGET_WINDOW_NAME "%ViewSourceWindow" @@ -56,7 +58,9 @@ typedef struct _DataObject { StatesEnum state; char tag[MAXTAGLEN+1]; uint tag_index; +#ifndef MODULAR_NETLIB int tag_type; +#endif PRBool in_broken_html; } DataObject; @@ -79,11 +83,13 @@ PRIVATE char *net_BeginColorHTMLTag (DataObject *obj) { char *new_markup = 0; +#ifndef MODULAR_NETLIB if (obj->tag_type == P_SCRIPT) { StrAllocCopy(new_markup, "
");
 		obj->tag_type = P_UNKNOWN;
 	  }
+#endif
 	StrAllocCat(new_markup, BEGIN_TAG_MARKUP);
 	StrAllocCat(new_markup, "<");
 	StrAllocCat(new_markup, BEGIN_TAG_NAME_MARKUP);
@@ -102,6 +108,7 @@ PRIVATE char *net_EndColorHTMLTag (DataObject *obj)
 	  }
 	StrAllocCat(new_markup, ">");
 	StrAllocCat(new_markup, END_TAG_MARKUP);
+#ifndef MODULAR_NETLIB
 	if (obj->tag_type == P_SCRIPT)
 	  {
 		StrAllocCat(new_markup, "
"); @@ -111,6 +118,7 @@ PRIVATE char *net_EndColorHTMLTag (DataObject *obj) { obj->state = IN_CONTENT; } +#endif return new_markup; } @@ -199,7 +207,9 @@ PRIVATE int net_ColorHTMLWrite (NET_StreamClass *stream, CONST char *s, int32 l) StrAllocCat(new_markup, tiny_buf); obj->state = IN_TAG; obj->tag[obj->tag_index] = '\0'; +#ifndef MODULAR_NETLIB obj->tag_type = pa_tokenize_tag(obj->tag); +#endif } else if(*cp == '>') { @@ -582,7 +592,9 @@ net_ColorHTMLStream (int format_out, obj->state = IN_CONTENT; obj->next_stream = next_stream; +#ifndef MODULAR_NETLIB obj->tag_type = P_UNKNOWN; +#endif new_stream->name = "HTML Colorer"; new_stream->complete = (MKStreamCompleteFunc) net_ColorHTMLComplete; diff --git a/network/cnvts/makefile.win b/network/cnvts/makefile.win index 21c0aa4be3f4..092279f2e326 100644 --- a/network/cnvts/makefile.win +++ b/network/cnvts/makefile.win @@ -41,16 +41,16 @@ MISCDEP=$(LLIBS) OBJS= \ .\$(OBJDIR)\cvactive.obj \ .\$(OBJDIR)\cvchunk.obj \ -!ifndef MODULAR_NETLIB .\$(OBJDIR)\cvcolor.obj \ - .\$(OBJDIR)\cvmime.obj \ - .\$(OBJDIR)\cvpics.obj \ -!endif .\$(OBJDIR)\cvdisk.obj \ .\$(OBJDIR)\cvsimple.obj \ .\$(OBJDIR)\cvunzip.obj \ .\$(OBJDIR)\cvjscfg.obj \ .\$(OBJDIR)\txview.obj \ +!ifndef MODULAR_NETLIB + .\$(OBJDIR)\cvmime.obj \ + .\$(OBJDIR)\cvpics.obj \ +!endif $(NULL)