From 103a68b2e7d0c12e6d44c43c344ebd10b67a9d79 Mon Sep 17 00:00:00 2001
From: Luqman Aden <me@luqman.ca>
Date: Mon, 13 May 2013 04:05:34 -0400
Subject: [PATCH] Correct #[always_inline] -> #[inline(always)] and
__attribute((...)) -> __attribute__((...)).
---
src/librustc/middle/trans/adt.rs | 2 +-
src/rt/rust_globals.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/librustc/middle/trans/adt.rs b/src/librustc/middle/trans/adt.rs
index 3274503e30380..21452a736fba8 100644
--- 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
index ff57af0833713..5a75ab5ea1b0b 100644
--- 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