squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

auto merge of #6447 : luqmana/rust/6446, r=thestinger

Browse source 
#6446
This commit is contained in:
bors 2013-05-13 01:25:43 -07:00
commit 8d4a3d58b7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/middle/trans/adt.rs
View file

@ -574,7 +574,7 @@ fn padding(size: u64) -> ValueRef {
}
// XXX this utility routine should be somewhere more general
#[always_inline]
#[inline(always)]
fn roundup(x: u64, a: u64) -> u64 { ((x + (a - 1)) / a) * a }
/// Get the discriminant of a constant value. (Not currently used.)

2
src/rt/rust_globals.h
View file

@ -20,7 +20,7 @@
#endif
#if defined(__GNUC__)
#define ALWAYS_INLINE __attribute((always_inline)) INLINE
#define ALWAYS_INLINE __attribute__((always_inline)) INLINE
#elif defined(_MSC_VER)
#define ALWAYS_INLINE __forceinline
#else