From 6b813b0edeabc7d8ee23118eb938d71091f0b815 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 21 Dec 2000 22:49:30 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/downloader/decompressor.cxx |  4 +++-
 panda/src/downloader/downloader.I     |  2 +-
 panda/src/downloader/downloader.cxx   | 14 +++++++++++---
 panda/src/downloader/extractor.cxx    |  2 ++
 panda/src/downloader/patcher.I        |  2 ++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/panda/src/downloader/decompressor.cxx b/panda/src/downloader/decompressor.cxx
index 00af97a47b..8997a2367e 100644
--- a/panda/src/downloader/decompressor.cxx
+++ b/panda/src/downloader/decompressor.cxx
@@ -15,6 +15,8 @@
 #include <stdio.h>
 #include <error_utils.h>
 
+#include <errno.h>
+
 ////////////////////////////////////////////////////////////////////
 // Defines
 ////////////////////////////////////////////////////////////////////
@@ -145,7 +147,7 @@ initiate(Filename &source_file, Filename &dest_file) {
   // half of the buffer to disk, and repeat.
   _total_bytes_read = 0;
   _read_all_input = false;
-  _source_buffer_length;
+  _source_buffer_length = 0;
   _initiated = true;
   _decompressor = new ZDecompressor();
   return EU_success;
diff --git a/panda/src/downloader/downloader.I b/panda/src/downloader/downloader.I
index 9ce018ccf9..5a921f377e 100644
--- a/panda/src/downloader/downloader.I
+++ b/panda/src/downloader/downloader.I
@@ -89,7 +89,7 @@ get_bytes_written(void) const {
     downloader_cat.warning()
       << "Downloader::get_bytes_written() - Download has not been "
       << "initiated" << endl;
-    return 0.0;
+    return 0;
   }
   if (_current_status != NULL)
     return _current_status->_total_bytes_written;
diff --git a/panda/src/downloader/downloader.cxx b/panda/src/downloader/downloader.cxx
index 7507019740..ab80605981 100644
--- a/panda/src/downloader/downloader.cxx
+++ b/panda/src/downloader/downloader.cxx
@@ -9,10 +9,18 @@
 #include "downloader.h"
 #include "config_downloader.h"
 
+#include <error_utils.h>
 #include <filename.h>
+
 #include <errno.h>
 #include <math.h>
-#include <error_utils.h>
+
+#if !defined(WIN32_VC)
+  #include <sys/time.h>
+  #include <netinet/in.h>
+  #include <arpa/inet.h>
+  #include <netdb.h>
+#endif
 
 ////////////////////////////////////////////////////////////////////
 // Defines
@@ -30,7 +38,7 @@ Downloader(void) {
   _byte_rate = downloader_byte_rate;
   _disk_write_frequency = downloader_disk_write_frequency;
   nassertv(_frequency > 0 && _byte_rate > 0 && _disk_write_frequency > 0);
-  _receive_size = _byte_rate * _frequency;
+  _receive_size = (ulong)(_byte_rate * _frequency);
   _disk_buffer_size = _disk_write_frequency * _receive_size;
   _buffer = new Buffer(_disk_buffer_size);
 
@@ -413,7 +421,7 @@ run(void) {
 
     // Allocate a new buffer
     _buffer.clear();
-    _receive_size = _frequency * _byte_rate;
+    _receive_size = (ulong)(_frequency * _byte_rate);
     _disk_buffer_size = _receive_size * _disk_write_frequency;
     _buffer = new Buffer(_disk_buffer_size);
     _current_status->_buffer = _buffer->_buffer;
diff --git a/panda/src/downloader/extractor.cxx b/panda/src/downloader/extractor.cxx
index 54f9420ded..8d8bae441e 100644
--- a/panda/src/downloader/extractor.cxx
+++ b/panda/src/downloader/extractor.cxx
@@ -12,6 +12,8 @@
 #include <filename.h>
 #include <error_utils.h>
 
+#include <errno.h>
+
 ////////////////////////////////////////////////////////////////////
 // Defines
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/downloader/patcher.I b/panda/src/downloader/patcher.I
index 162cc476db..f7d2fd20b6 100644
--- a/panda/src/downloader/patcher.I
+++ b/panda/src/downloader/patcher.I
@@ -13,4 +13,6 @@ get_progress(void) const {
   if(_patchfile) {
     return _patchfile->get_progress();
   }
+
+  return 0.0;
 }