diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-29 18:22:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-11 11:34:17 +0100 |
| commit | 00d26a728db2814620f390b418a7d6325ce5aca6 (patch) | |
| tree | 1a08a766ac3682d979bba42bb32150b3e6b93fdc /sdch | |
| parent | b3a45980d5cfbb62c937045255faa29a8ffea9f3 (diff) | |
| download | external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.zip external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.tar.gz external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.tar.bz2 | |
Collection of all the changs to external chromium.
Time is running out, I guess we have to submit this and remember to upstream.
Rebased to chromium r53293
Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
Diffstat (limited to 'sdch')
| -rw-r--r-- | sdch/open-vcdiff/src/gflags/gflags.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sdch/open-vcdiff/src/gflags/gflags.h b/sdch/open-vcdiff/src/gflags/gflags.h index 5517ec4..ce4c1b8 100644 --- a/sdch/open-vcdiff/src/gflags/gflags.h +++ b/sdch/open-vcdiff/src/gflags/gflags.h @@ -105,7 +105,11 @@ typedef unsigned __int32 uint32; typedef __int64 int64; typedef unsigned __int64 uint64; #else -#error Do not know how to define a 32-bit integer quantity on your system +typedef int32_t int32; +typedef uint32_t uint32; +typedef int64_t int64; +typedef uint64_t uint64; +//#error Do not know how to define a 32-bit integer quantity on your system #endif // -------------------------------------------------------------------- |