diff --git a/desmume/src/cflash.cpp b/desmume/src/cflash.cpp
index e5d3c297e..276d32b4e 100644
--- a/desmume/src/cflash.cpp
+++ b/desmume/src/cflash.cpp
@@ -771,7 +771,7 @@ cflash_write(unsigned int address,unsigned int data) {
               LSEEK_FN( disk_image, currLBA, SEEK_SET);
               
               while( written < 512) {
-                ssize_t cur_write =
+                size_t cur_write =
                   WRITE_FN( disk_image, &sector_data[written], 512 - written);
                 written += cur_write;
 
diff --git a/desmume/src/memorystream.h b/desmume/src/memorystream.h
index 5fda899b5..82b6fbdda 100644
--- a/desmume/src/memorystream.h
+++ b/desmume/src/memorystream.h
@@ -180,7 +180,7 @@ private:
 		setg(buf, buf+rp, buf + length);
 	}
 
-	void expand(ssize_t upto)
+	void expand(size_t upto)
 	{
 		if(!myBuf && !usevec)
 			throw new std::runtime_error("memory_streambuf is not expandable");
@@ -189,7 +189,7 @@ private:
 		if(upto == -1)
 			newcapacity = capacity + capacity/2 + 2;
 		else
-			newcapacity = std::max((size_t)upto,capacity);
+			newcapacity = std::max(upto,capacity);
 
 		if(newcapacity == capacity) return;