mfbt/double-conversion/use-StandardInteger.patch
author Mark Banner <bugzilla@standard8.plus.com>
Fri, 24 Aug 2012 16:23:14 +0100
changeset 103331 85634e93f08dc6d63d5963c48bd03dcc267ad324
parent 91511 463626bffba7aa5a7a92649e304c2da5f6a11735
child 136740 abd9f7b3ded5e137306e36be6af8da38a5f4004b
permissions -rw-r--r--
Backout part of the follow-up to bug 785102 for causing unexpected segfaults on the Linux 64 bit builds. r=bustage-fix

diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
index cd3e330..bdc7d4b 100644
--- a/mfbt/double-conversion/utils.h
+++ b/mfbt/double-conversion/utils.h
@@ -68,23 +68,7 @@
 #endif
 
 
-#if defined(_WIN32) && !defined(__MINGW32__)
-
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef short int16_t;  // NOLINT
-typedef unsigned short uint16_t;  // NOLINT
-typedef int int32_t;
-typedef unsigned int uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-// intptr_t and friends are defined in crtdefs.h through stdio.h.
-
-#else
-
-#include <stdint.h>
-
-#endif
+#include "mozilla/StandardInteger.h"
 
 // The following macro works on both 32 and 64-bit platforms.
 // Usage: instead of writing 0x1234567890123456