From 657ecf24f00bb359c954be498e8f1c49fc07f4cd Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 13 Aug 2003 21:43:34 +0000
Subject: [PATCH] allow removing nspr

---
 panda/src/downloader/Sources.pp                | 5 ++---
 panda/src/downloader/downloader_composite1.cxx | 1 +
 panda/src/downloader/downloader_composite3.cxx | 2 --
 panda/src/express/threadDummyImpl.h            | 2 --
 4 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 panda/src/downloader/downloader_composite3.cxx

diff --git a/panda/src/downloader/Sources.pp b/panda/src/downloader/Sources.pp
index 41219c8b15..2ceae3055f 100644
--- a/panda/src/downloader/Sources.pp
+++ b/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 \
diff --git a/panda/src/downloader/downloader_composite1.cxx b/panda/src/downloader/downloader_composite1.cxx
index 5abc4359b9..b77a6adf60 100644
--- a/panda/src/downloader/downloader_composite1.cxx
+++ b/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"
diff --git a/panda/src/downloader/downloader_composite3.cxx b/panda/src/downloader/downloader_composite3.cxx
deleted file mode 100644
index 74ca4e02cc..0000000000
--- a/panda/src/downloader/downloader_composite3.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "downloadDb.cxx"
-
diff --git a/panda/src/express/threadDummyImpl.h b/panda/src/express/threadDummyImpl.h
index 787f574df5..bf1afd8334 100644
--- a/panda/src/express/threadDummyImpl.h
+++ b/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