From dd0db83c0430a9e1221b561495d28510c0f05778 Mon Sep 17 00:00:00 2001
From: montulli <montulli>
Date: Wed, 17 Jun 1998 21:27:01 +0000
Subject: [PATCH] merge branch to tip.  This directory is not in the build yet

---
 network/cstream/Makefile     | 3 ++-
 network/cstream/cstream.h    | 4 ++--
 network/cstream/makefile.win | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/network/cstream/Makefile b/network/cstream/Makefile
index 10a5573cc02e..9bd5faa3f04c 100644
--- a/network/cstream/Makefile
+++ b/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
 
diff --git a/network/cstream/cstream.h b/network/cstream/cstream.h
index dc40eab4c7bc..d3a6d99f6437 100644
--- a/network/cstream/cstream.h
+++ b/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
  */
diff --git a/network/cstream/makefile.win b/network/cstream/makefile.win
index 4a6703177b2b..128a84b6d2cd 100644
--- a/network/cstream/makefile.win
+++ b/network/cstream/makefile.win
@@ -79,6 +79,8 @@ LINCS= \
 include <$(DEPTH)\config\rules.mak> 
 
 libs:: $(LIBRARY)
+
+install::
     $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib