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

@@ -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
 

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	\

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);
 	}