5 files changed, 15 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bada3b074..6769de5127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Sun May 11 22:27:18 2014  Tanaka Akira  <akr@fsij.org>
+
+	* compile.c (BUFSIZE): Unused macro removed.
+
+	* vm.c (BUFSIZE): Ditto.
+
+	* pack.c (INT64toNUM): Ditto.
+	  (UINT64toNUM): Ditto.
+	  (BYTEWIDTH): Ditto.
+
+	* time.c (lshift): Ditto.
+	  (UINT64toNUM): Ditto.
+	  (id_lshift): Unused variable removed.
+
 Sun May 11 21:23:27 2014  Tanaka Akira  <akr@fsij.org>
 
 	* pack.c (swaps): Unused macro removed.
diff --git a/compile.c b/compile.c
index d30966db35..99532b3e29 100644
--- a/compile.c
+++ b/compile.c
@@ -2996,8 +2996,6 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
     return done;
 }
 
-#define BUFSIZE 0x100
-
 static VALUE
 make_name_for_block(rb_iseq_t *iseq)
 {
diff --git a/pack.c b/pack.c
index aae9ceebfb..a93f7ddc92 100644
--- a/pack.c
+++ b/pack.c
@@ -70,14 +70,6 @@ static const char endstr[] = "sSiIlLqQ";
 # define NATINT_LEN(type,len) ((int)sizeof(type))
 #endif
 
-#if SIZEOF_LONG == 8
-# define INT64toNUM(x) LONG2NUM(x)
-# define UINT64toNUM(x) ULONG2NUM(x)
-#elif defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
-# define INT64toNUM(x) LL2NUM(x)
-# define UINT64toNUM(x) ULL2NUM(x)
-#endif
-
 #define define_swapx(x, xtype)		\
 static xtype				\
 TOKEN_PASTE(swap,x)(xtype z)		\
@@ -1899,8 +1891,6 @@ pack_unpack(VALUE str, VALUE fmt)
     return ary;
 }
 
-#define BYTEWIDTH 8
-
 int
 rb_uv_to_utf8(char buf[6], unsigned long uv)
 {
diff --git a/time.c b/time.c
index 43ae533829..b8c68d642c 100644
--- a/time.c
+++ b/time.c
@@ -34,7 +34,7 @@
 #include "timev.h"
 
 static ID id_divmod, id_mul, id_submicro, id_nano_num, id_nano_den, id_offset, id_zone;
-static ID id_eq, id_ne, id_quo, id_div, id_cmp, id_lshift;
+static ID id_eq, id_ne, id_quo, id_div, id_cmp;
 
 #define NDIV(x,y) (-(-((x)+1)/(y))-1)
 #define NMOD(x,y) ((y)-(-((x)+1)%(y))-1)
@@ -172,7 +172,6 @@ mod(VALUE x, VALUE y)
 }
 
 #define neg(x) (sub(INT2FIX(0), (x)))
-#define lshift(x,y) (rb_funcall((x), id_lshift, 1, (y)))
 
 static VALUE
 quo(VALUE x, VALUE y)
@@ -214,10 +213,8 @@ divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r)
 
 #if SIZEOF_LONG == 8
 # define INT64toNUM(x) LONG2NUM(x)
-# define UINT64toNUM(x) ULONG2NUM(x)
 #elif defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
 # define INT64toNUM(x) LL2NUM(x)
-# define UINT64toNUM(x) ULL2NUM(x)
 #endif
 
 #if defined(HAVE_UINT64_T) && SIZEOF_LONG*2 <= SIZEOF_UINT64_T
@@ -4947,7 +4944,6 @@ Init_Time(void)
     id_quo = rb_intern("quo");
     id_div = rb_intern("div");
     id_cmp = rb_intern("<=>");
-    id_lshift = rb_intern("<<");
     id_divmod = rb_intern("divmod");
     id_mul = rb_intern("*");
     id_submicro = rb_intern("submicro");
diff --git a/vm.c b/vm.c
index 87e0783812..0cff543a27 100644
--- a/vm.c
+++ b/vm.c
@@ -85,7 +85,6 @@ static rb_serial_t ruby_vm_class_serial = 1;
 
 #include <assert.h>
 
-#define BUFSIZE 0x100
 #define PROCDEBUG 0
 
 rb_serial_t