Bug 594769 - qcms fails to compile on mingw r=jmuizelaar a=joe
authorJacek Caban <jacek@codeweavers.com>
Thu, 14 Oct 2010 21:00:22 +0000
changeset 55808 49c6997d5e095a3405f20c9c65af72836a50eb04
parent 55807 bfa9a991f78ed01ac54b5262e3cc93b665a347f4
child 55809 a6e70b28834faabb442e7690bd0e610aa95ca969
push id16294
push userjacek@codeweavers.com
push dateThu, 14 Oct 2010 20:14:06 +0000
treeherdermozilla-central@13761705921c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmuizelaar, joe
bugs594769
milestone2.0b8pre
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 594769 - qcms fails to compile on mingw r=jmuizelaar a=joe
gfx/qcms/qcmstypes.h
--- a/gfx/qcms/qcmstypes.h
+++ b/gfx/qcms/qcmstypes.h
@@ -20,19 +20,17 @@ typedef PRUint16 uint16_t;
 typedef PRInt32 int32_t;
 typedef PRUint32 uint32_t;
 typedef PRInt64 int64_t;
 typedef PRUint64 uint64_t;
 
 #ifdef __OS2__
 /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
 #include <stdlib.h>
-#elif defined(__FreeBSD__)
-/* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */
-#else
+#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
 typedef PRUptrdiff uintptr_t;
 #endif
 #endif
 
 #else // MOZ_QCMS
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define IS_LITTLE_ENDIAN