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

#6446
2013-05-13 01:25:43 -07:00 · 2013-05-13 01:25:43 -07:00 · 8d4a3d58b7
commit 8d4a3d58b7
parent 8a5561bc18 103a68b2e7
2 changed files with 2 additions and 2 deletions
--- a/src/librustc/middle/trans/adt.rs
+++ b/src/librustc/middle/trans/adt.rs
@ -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.)
--- a/src/rt/rust_globals.h
+++ b/src/rt/rust_globals.h
@ -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