summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2012-07-11 16:32:21 -0400
committerEric Milkie <milkie@10gen.com>2012-07-11 16:33:04 -0400
commita31879b251308a14b5414b6a5d3f9dae495b23ea (patch)
treee5d2e3f731d6edd2b343d0b0a5765ba89c6b6d96
parent6b24994f08a37739b359aed6950f87286aa562df (diff)
downloadmongo-a31879b251308a14b5414b6a5d3f9dae495b23ea.tar.gz
Windows does not have ssize_t
-rw-r--r--db/extsort.cpp6
-rw-r--r--db/extsort.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/db/extsort.cpp b/db/extsort.cpp
index e0d4d0cf93c..0838b7ffb4e 100644
--- a/db/extsort.cpp
+++ b/db/extsort.cpp
@@ -241,10 +241,10 @@ namespace mongo {
}
- bool BSONObjExternalSorter::FileIterator::_read( char* buf, ssize_t count ) {
- ssize_t total = 0;
+ bool BSONObjExternalSorter::FileIterator::_read( char* buf, long long count ) {
+ long long total = 0;
while ( total < count ) {
- ssize_t now = ::read( _file, buf, count );
+ long long now = ::read( _file, buf, count );
if ( now < 0 ) {
log() << "read failed for BSONObjExternalSorter " << errnoWithDescription() << endl;
return false;
diff --git a/db/extsort.h b/db/extsort.h
index 04f9e5e6f85..8f67acd55fa 100644
--- a/db/extsort.h
+++ b/db/extsort.h
@@ -76,7 +76,7 @@ namespace mongo {
bool more();
Data next();
private:
- bool _read( char* buf, ssize_t count );
+ bool _read( char* buf, long long count );
int _file;
unsigned long long _length;