allow removing nspr

panda/src/downloader/Sources.pp

@@ -7,7 +7,6 @@
   #define TARGET downloader
 
   #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx \
-    $[if $[HAVE_NET], $[TARGET]_composite3.cxx] \
     $[if $[HAVE_ZLIB], $[TARGET]_composite4.cxx] \
 
   #define SOURCES \
@@ -18,6 +17,7 @@
     bioStream.I bioStream.h bioStreamBuf.h \
     chunkedStream.I chunkedStream.h chunkedStreamBuf.h \
     documentSpec.I documentSpec.h \
+    downloadDb.I downloadDb.h \
     extractor.h \
     httpAuthorization.I httpAuthorization.h \
     httpBasicAuthorization.I httpBasicAuthorization.h \
@@ -32,7 +32,6 @@
     multiplexStreamBuf.I multiplexStreamBuf.h \
     socketStream.h socketStream.I \
     urlSpec.I urlSpec.h \
-    $[if $[HAVE_NET], downloadDb.I downloadDb.h] \
     $[if $[HAVE_ZLIB], decompressor.h download_utils.h] \
     $[if $[HAVE_CRYPTO], patcher.cxx patcher.h patcher.I]
     
@@ -44,6 +43,7 @@
     bioStream.cxx bioStreamBuf.cxx \
     chunkedStream.cxx chunkedStreamBuf.cxx \
     documentSpec.cxx \
+    downloadDb.cxx \
     extractor.cxx \
     httpAuthorization.cxx \
     httpBasicAuthorization.cxx \
@@ -57,7 +57,6 @@
     multiplexStream.cxx multiplexStreamBuf.cxx \
     socketStream.cxx \
     urlSpec.cxx \
-    $[if $[HAVE_NET], downloadDb.cxx] \
     $[if $[HAVE_ZLIB], decompressor.cxx download_utils.cxx]
 
   #define INSTALL_HEADERS \

panda/src/downloader/downloader_composite1.cxx

@@ -6,6 +6,7 @@
 #include "bioStreamBuf.cxx"
 #include "chunkedStream.cxx"
 #include "chunkedStreamBuf.cxx"
+#include "downloadDb.cxx"
 #include "extractor.cxx"
 #include "httpDate.cxx"
 #include "httpEntityTag.cxx"

panda/src/downloader/downloader_composite3.cxx

@@ -1,2 +0,0 @@
-#include "downloadDb.cxx"
-

panda/src/express/threadDummyImpl.h

@@ -28,8 +28,6 @@
 #include "threadPriority.h"
 #include "pmutex.h"
 
-#include <prthread.h>
-
 class Thread;
 
 // The Irix system headers may define this as a macro.  Get it out of