merge branch to tip. This directory is not in the build yet

git-svn-id: svn://10.0.0.236/trunk@4013 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/network/cstream/Makefile

@@ -26,7 +26,8 @@ CSRCS		= \
 
 EXPORTS= cstream.h strmutil.h
 
-REQUIRES	= network nspr2 dbm util pref js java fileurl security layer img jtools
+REQUIRES	= network nspr2 dbm util pref js java fileurl security \
+	layer img jtools netcnvts
 
 include $(DEPTH)/config/rules.mk
 

mozilla/network/cstream/cstream.h

@@ -96,7 +96,7 @@ struct _NET_StreamClass {
  * are printed out.
  */
 extern char *
-XP_ListNextPresentationType(XP_Bool first);
+XP_ListNextPresentationType(PRBool first);
 
 /* prints out all encoding mime types during successive calls
  * call with first equal true to reset to the beginning
@@ -105,7 +105,7 @@ XP_ListNextPresentationType(XP_Bool first);
  * are printed out.
  */
 extern char *
-XP_ListNextEncodingType(XP_Bool first);
+XP_ListNextEncodingType(PRBool first);
 
 /* register a mime type and a command to be executed
  */

mozilla/network/cstream/makefile.win

@@ -79,6 +79,8 @@ LINCS= \
 include <$(DEPTH)\config\rules.mak> 
 
 libs:: $(LIBRARY)
+
+install::
     $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib