Skip to content

Commit 69e70d3

Browse files
committed
---
yaml --- r: 92912 b: refs/heads/auto c: 1c3c010 h: refs/heads/master v: v3
1 parent 5861059 commit 69e70d3

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 19d8ab8d5a311e502a55189d2a34858f8413fbef
16+
refs/heads/auto: 1c3c0103c4f0719479b4737c9216b5481561c69a
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libextra/ebml.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,9 @@ pub mod reader {
122122
fail!("vint too big");
123123
}
124124

125-
#[cfg(target_arch = "x86")]
126-
#[cfg(target_arch = "x86_64")]
127125
pub fn vuint_at(data: &[u8], start: uint) -> Res {
128126
use std::ptr::offset;
129-
use std::unstable::intrinsics::bswap32;
127+
use std::unstable::intrinsics::from_be32;
130128

131129
if data.len() - start < 4 {
132130
return vuint_at_slow(data, start);
@@ -136,7 +134,7 @@ pub mod reader {
136134
let (ptr, _): (*u8, uint) = transmute(data);
137135
let ptr = offset(ptr, start as int);
138136
let ptr: *i32 = transmute(ptr);
139-
let val = bswap32(*ptr);
137+
let val = from_be32(*ptr);
140138
let val: u32 = transmute(val);
141139
if (val & 0x80000000) != 0 {
142140
Res {
@@ -162,11 +160,6 @@ pub mod reader {
162160
}
163161
}
164162

165-
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))]
166-
pub fn vuint_at(data: &[u8], start: uint) -> Res {
167-
vuint_at_slow(data, start)
168-
}
169-
170163
pub fn Doc<'a>(data: &'a [u8]) -> Doc<'a> {
171164
Doc { data: data, start: 0u, end: data.len() }
172165
}

0 commit comments

Comments
 (0)