← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lightning-extension/quantal

« back to all changes in this revision

Viewing changes to mozilla/mfbt/double-conversion/use-StandardInteger.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-06-20 23:50:32 UTC
  • mfrom: (1.3.2)
  • Revision ID: package-import@ubuntu.com-20120620235032-fx5tuhrswvsju9z3
Tags: 1.6~b1+build1-0ubuntu1
New upstream release from the beta channel (CALENDAR_1_6b1_BUILD1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/mfbt/double-conversion/use-StandardInteger.patch
 
1
diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
 
2
index cd3e330..bdc7d4b 100644
 
3
--- a/mfbt/double-conversion/utils.h
 
4
+++ b/mfbt/double-conversion/utils.h
 
5
@@ -68,23 +68,7 @@
 
6
 #endif
 
7
 
 
8
 
 
9
-#if defined(_WIN32) && !defined(__MINGW32__)
 
10
-
 
11
-typedef signed char int8_t;
 
12
-typedef unsigned char uint8_t;
 
13
-typedef short int16_t;  // NOLINT
 
14
-typedef unsigned short uint16_t;  // NOLINT
 
15
-typedef int int32_t;
 
16
-typedef unsigned int uint32_t;
 
17
-typedef __int64 int64_t;
 
18
-typedef unsigned __int64 uint64_t;
 
19
-// intptr_t and friends are defined in crtdefs.h through stdio.h.
 
20
-
 
21
-#else
 
22
-
 
23
-#include <stdint.h>
 
24
-
 
25
-#endif
 
26
+#include "mozilla/StandardInteger.h"
 
27
 
 
28
 // The following macro works on both 32 and 64-bit platforms.
 
29
 // Usage: instead of writing 0x1234567890123456