Unix updates

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

mozilla/shell/src/Makefile

@@ -25,7 +25,7 @@ MODULE=shell
 
 LIBRARY_NAME = shell
 
-DEFINES = -D_IMPL_NS_SHELL
+DEFINES = -D_IMPL_NS_SHELL -DNSPR20
 
 EXTRA_DSO_LDOPTS+= -L$(DIST)/lib \
 		$(DIST)/bin/libxpcom.so \
@@ -50,7 +50,7 @@ endif
 LCFLAGS=-I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor \
       -I$(PUBLIC)/dom -I$(PUBLIC)/js -I$(PUBLIC)/netlib -I$(PUBLIC)/shell
 
-REQUIRES = xpcom raptor dom js netlib shell
+REQUIRES = xpcom raptor dom js netlib shell pref
 
 EXPORTS =				\
  nsApplicationManager.h			\

mozilla/shell/src/nsShellInstance.cpp

@@ -17,12 +17,14 @@
  */
 #define NS_IMPL_IDS 1
 
-#include "nspr.h"
-#include "net.h"
 
 #include <stdio.h>
 #include "nscore.h"
 
+#include "nspr.h"
+#include "net.h"
+
+
 #ifdef NS_WIN32
 #include "windows.h"
 #elif NS_UNIX