From 350aab065bd8afb47016c3db886d39922b935073 Mon Sep 17 00:00:00 2001
From: scullin <scullin@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 13 Jul 1998 23:41:21 +0000
Subject: [PATCH] Re-add mkstream to nglayout build, give a default value to
 memory cache pref if defaults aren't loaded. Approved, reviewed by ltabb.

git-svn-id: svn://10.0.0.236/trunk@5437 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/network/main/Makefile     | 2 +-
 mozilla/network/main/makefile.win | 2 --
 mozilla/network/main/mkgeturl.c   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mozilla/network/main/Makefile b/mozilla/network/main/Makefile
index 5f9249a6fcc..434fd599842 100644
--- a/mozilla/network/main/Makefile
+++ b/mozilla/network/main/Makefile
@@ -39,6 +39,7 @@ CSRCS		= \
 	mkselect.c	\
 	mksockrw.c	\
 	mksort.c	\
+	mkstream.c	\
 	mktrace.c	\
 	mkutils.c	\
 	prefetch.c	\
@@ -48,7 +49,6 @@ CSRCS		= \
 ifndef MODULAR_NETLIB
 CSRCS += \
 	mkinit.c	\
-	mkstream.c	\
 	$(NULL)
 endif
 
diff --git a/mozilla/network/main/makefile.win b/mozilla/network/main/makefile.win
index e887eb81783..f98aa492f92 100644
--- a/mozilla/network/main/makefile.win
+++ b/mozilla/network/main/makefile.win
@@ -57,9 +57,7 @@ OBJS=   \
 	.\$(OBJDIR)\mkselect.obj	\
 	.\$(OBJDIR)\mksockrw.obj	\
 	.\$(OBJDIR)\mksort.obj		\
-!ifndef MODULAR_NETLIB
 	.\$(OBJDIR)\mkstream.obj	\
-!endif
 	.\$(OBJDIR)\mktrace.obj		\
 	.\$(OBJDIR)\mkutils.obj		\
 	.\$(OBJDIR)\prefetch.obj	\
diff --git a/mozilla/network/main/mkgeturl.c b/mozilla/network/main/mkgeturl.c
index 66f537d6ac0..67b36f8d107 100644
--- a/mozilla/network/main/mkgeturl.c
+++ b/mozilla/network/main/mkgeturl.c
@@ -604,7 +604,7 @@ NET_SetupPrefs(const char * prefChanged)
 	}
 		
 	if (bSetupAll || !PL_strcmp(prefChanged,"browser.cache.memory_cache_size")) {
-		int32 nMemCache;
+		int32 nMemCache = 8192;
 		PREF_GetIntPref("browser.cache.memory_cache_size",&nMemCache);
 		NET_SetMemoryCacheSize(nMemCache * 1024);
 	}