From 4d88d8ea5ded2b40ce48e27622c1ea864ca1805f Mon Sep 17 00:00:00 2001
From: Jeff Bezanson <jeff.bezanson@gmail.com>
Date: Wed, 2 Apr 2014 15:16:38 -0400
Subject: [PATCH] fix deprecated a[i:] syntax and a merge error where
 fdwatcher_reinit should be fdwatcher_init.

---
 base/inference.jl | 2 +-
 base/poll.jl      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/inference.jl b/base/inference.jl
index c3143305c68b8..f251521eee8ed 100644
--- a/base/inference.jl
+++ b/base/inference.jl
@@ -2378,7 +2378,7 @@ function inlining_pass(e::Expr, sv, ast)
         end
 
         for ninline = 1:100
-            atypes = tuple(map(exprtype, e.args[2:])...)
+            atypes = tuple(map(exprtype, e.args[2:end])...)
             if length(atypes) > MAX_TUPLETYPE_LEN
                 atypes = limit_tuple_type(atypes)
             end
diff --git a/base/poll.jl b/base/poll.jl
index 3513d21940302..f81fa24073b2e 100644
--- a/base/poll.jl
+++ b/base/poll.jl
@@ -171,7 +171,7 @@ end
 # on unix
 
 let
-    global fdwatcher_reinit, wait
+    global fdwatcher_init, wait
     @unix_only begin
         local fdwatcher_array
         function fdwatcher_init()