Bug 625315 - Invalid ssize_t define on Windows x64. r=jasone a=bsmedberg
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Thu, 03 Feb 2011 14:36:15 +0900
changeset 61825 82709dbd2c96ee46881aabdd13ebb34d2dfb7fb1
parent 61824 bdb4c38c56dee48ca514f6e3294f4895e2a6aa44
child 61826 ec65b5c5f68a74841ed43a6be7c937664a51fca9
push id18510
push userm_kato@ga2.so-net.ne.jp
push dateThu, 03 Feb 2011 05:39:28 +0000
treeherdermozilla-central@82709dbd2c96 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjasone, bsmedberg
bugs625315
milestone2.0b12pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 625315 - Invalid ssize_t define on Windows x64. r=jasone a=bsmedberg
memory/jemalloc/jemalloc.c
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -282,17 +282,21 @@ ffs(int x)
 	return 32 - _CountLeadingZeros((-x) & x);
 }
 #endif
 
 typedef unsigned char uint8_t;
 typedef unsigned uint32_t;
 typedef unsigned long long uint64_t;
 typedef unsigned long long uintmax_t;
+#if defined(MOZ_MEMORY_SIZEOF_PTR_2POW) && (MOZ_MEMORY_SIZEOF_PTR_2POW == 3)
+typedef long long ssize_t;
+#else
 typedef long ssize_t;
+#endif
 
 #define	MALLOC_DECOMMIT
 #endif
 
 #ifndef MOZ_MEMORY_WINDOWS
 #ifndef MOZ_MEMORY_SOLARIS
 #include <sys/cdefs.h>
 #endif