Correct #[always_inline] -> #[inline(always)] and __attribute((...)) -> __attribute__((...)).

luqmana · luqmana · commit 103a68b2e7d0 · 2013-05-13T04:05:34.000-04:00
diff --git 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.)
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ fn padding(size: u64) -> ValueRef {`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`// XXX this utility routine should be somewhere more general`
`577`		`-#[always_inline]`
	`577`	`+#[inline(always)]`
`578`	`578`	`fn roundup(x: u64, a: u64) -> u64 { ((x + (a - 1)) / a) * a }`
`579`	`579`
`580`	`580`	`/// Get the discriminant of a constant value. (Not currently used.)`