Fix warnings when not using the `master` feature

2 files changed, 4 insertions, 3 deletions

diff --git a/src/builder.rs b/src/builder.rs
index b426219a809..2c5ae3fff7b 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -4,8 +4,8 @@ use std::convert::TryFrom;
 use std::ops::Deref;
 
 use gccjit::{
-    BinaryOp, Block, ComparisonOp, Context, Function, FunctionType, LValue, Location, RValue,
-    ToRValue, Type, UnaryOp,
+    BinaryOp, Block, ComparisonOp, Context, Function, LValue, Location, RValue, ToRValue, Type,
+    UnaryOp,
 };
 use rustc_abi as abi;
 use rustc_abi::{Align, HasDataLayout, Size, TargetDataLayout, WrappingRange};
@@ -785,7 +785,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
                 let f128_type = self.type_f128();
                 let fmodf128 = self.context.new_function(
                     None,
-                    FunctionType::Extern,
+                    gccjit::FunctionType::Extern,
                     f128_type,
                     &[
                         self.context.new_parameter(None, f128_type, "a"),
diff --git a/src/intrinsic/llvm.rs b/src/intrinsic/llvm.rs
index 25a765f571f..97b94428187 100644
--- a/src/intrinsic/llvm.rs
+++ b/src/intrinsic/llvm.rs
@@ -1556,4 +1556,5 @@ pub fn intrinsic<'gcc, 'tcx>(name: &str, cx: &CodegenCx<'gcc, 'tcx>) -> Function
     func
 }
 
+#[cfg(feature = "master")]
 include!("archs.rs");