Merge remote-tracking branch 'origin/llvm7'

2 files changed, 3 insertions, 2 deletions

diff --git a/std/math/isnan.zig b/std/math/isnan.zig
index ef3002d8e1..e05c1428b0 100644
--- a/std/math/isnan.zig
+++ b/std/math/isnan.zig
@@ -23,8 +23,8 @@ pub fn isNan(x: var) bool {
     }
 }
 
-// Note: A signalling nan is identical to a standard right now by may have a different bit
-// representation in the future when required.
+/// Note: A signalling nan is identical to a standard nan right now but may have a different bit
+/// representation in the future when required.
 pub fn isSignalNan(x: var) bool {
     return isNan(x);
 }
diff --git a/std/math/log1p.zig b/std/math/log1p.zig
index 7d3be6bb49..903fceac05 100644
--- a/std/math/log1p.zig
+++ b/std/math/log1p.zig
@@ -6,6 +6,7 @@
 // - log1p(x)     = nan if x < -1
 // - log1p(nan)   = nan
 
+const builtin = @import("builtin");
 const std = @import("../index.zig");
 const math = std.math;
 const assert = std.debug.assert;