From a122bab979841d284c979d1e186f6d148e6d53fb Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 26 Oct 2000 05:18:37 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/dxgsg/dxGraphicsStateGuardian.cxx |  2 --
 panda/src/express/Sources.pp                |  1 +
 panda/src/ipc/Sources.pp                    |  1 +
 panda/src/net/Sources.pp                    | 12 ++++++------
 panda/src/sgraphutil/sceneGraphAnalyzer.cxx | 10 +++++++---
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx
index b7617c5597..2ab3be41d9 100644
--- a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx
+++ b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx
@@ -1134,8 +1134,6 @@ draw_linestrip(const GeomLinestrip* geom) {
 	    p_colr = D3DRGBA(p_color[0], p_color[1], p_color[2], p_color[3]);
 	    }
 
-	size_t vertex_size = draw_prim_setup(geom);
-
     int nVerts = *(plen++);
     nassertv(nVerts >= 2);
 
diff --git a/panda/src/express/Sources.pp b/panda/src/express/Sources.pp
index 7a34fc74e2..f9614d2b11 100644
--- a/panda/src/express/Sources.pp
+++ b/panda/src/express/Sources.pp
@@ -3,6 +3,7 @@
 
 #begin lib_target
   #define TARGET express
+  #define USE_NSPR yes
   
   #define SOURCES							\
     bigEndian.I bigEndian.cxx bigEndian.h buffer.I buffer.cxx buffer.h	\
diff --git a/panda/src/ipc/Sources.pp b/panda/src/ipc/Sources.pp
index 81ce29a9df..2ba165d4be 100644
--- a/panda/src/ipc/Sources.pp
+++ b/panda/src/ipc/Sources.pp
@@ -1,5 +1,6 @@
 #define LOCAL_LIBS express pandabase
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m
+#define USE_NSPR yes
 
 #begin lib_target
   #define TARGET ipc
diff --git a/panda/src/net/Sources.pp b/panda/src/net/Sources.pp
index e393966786..bec0b0f6af 100644
--- a/panda/src/net/Sources.pp
+++ b/panda/src/net/Sources.pp
@@ -37,7 +37,7 @@
 #begin test_bin_target
   #define TARGET test_datagram
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
   #define SOURCES \
     test_datagram.cxx
@@ -47,7 +47,7 @@
 #begin test_bin_target
   #define TARGET test_spam_client
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_spam_client.cxx
@@ -57,7 +57,7 @@
 #begin test_bin_target
   #define TARGET test_spam_server
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_spam_server.cxx
@@ -67,7 +67,7 @@
 #begin test_bin_target
   #define TARGET test_tcp_client
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_tcp_client.cxx
@@ -77,7 +77,7 @@
 #begin test_bin_target
   #define TARGET test_tcp_server
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_tcp_server.cxx
@@ -87,7 +87,7 @@
 #begin test_bin_target
   #define TARGET test_udp
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_udp.cxx
diff --git a/panda/src/sgraphutil/sceneGraphAnalyzer.cxx b/panda/src/sgraphutil/sceneGraphAnalyzer.cxx
index c00e456a41..99985f04e6 100644
--- a/panda/src/sgraphutil/sceneGraphAnalyzer.cxx
+++ b/panda/src/sgraphutil/sceneGraphAnalyzer.cxx
@@ -99,9 +99,13 @@ write(ostream &out, int indent_level) const {
     << _num_instances << " instances).\n";
 
   indent(out, indent_level)
-    << _num_transforms << " transforms; "
-    << 100 * _num_arcs_with_transitions / _num_arcs 
-    << "% of arcs have some transition.\n";
+    << _num_transforms << " transforms";
+
+  if (_num_arcs != 0) {
+    out << "; " << 100 * _num_arcs_with_transitions / _num_arcs 
+	<< "% of arcs have some transition.";
+  }
+  out << "\n";
 
   indent(out, indent_level)
     << _num_geoms << " Geoms ";