From cebc9487474b22658c853b817b163a6d13d15d35 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 8 Jun 2016 05:41:08 +0000
Subject: fix date build

* common.mk (zonetabl.h): fix typo.

* ext/date/zonetab.list: remove forward declaration which may be
  conflict with the later definition.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk             | 4 ++--
 ext/date/zonetab.h    | 2 +-
 ext/date/zonetab.list | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common.mk b/common.mk
index ec9e999145..9a0758259f 100644
--- a/common.mk
+++ b/common.mk
@@ -789,7 +789,7 @@ EXT_SRCS = $(srcdir)/ext/ripper/ripper.c \
 srcs-ext: $(EXT_SRCS)
 
 srcs-extra: $(srcdir)/ext/json/parser/parser.c \
-	    $(srcdir)/ext/date/zonetab.c \
+	    $(srcdir)/ext/date/zonetab.h \
 	    $(empty)
 
 LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
@@ -891,7 +891,7 @@ $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
 	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
 
-$(srcdir)/ext/date/zonetab.c: $(srcdir)/ext/date/zonetab.list
+$(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
diff --git a/ext/date/zonetab.h b/ext/date/zonetab.h
index d759a2274d..9d234a5e43 100644
--- a/ext/date/zonetab.h
+++ b/ext/date/zonetab.h
@@ -35,7 +35,7 @@ struct zone {
     int name;
     int offset;
 };
-static inline const struct zone *zonetab();
+
 #line 9 "zonetab.list"
 struct zone;
 /* maximum key range = 434, duplicates = 0 */
diff --git a/ext/date/zonetab.list b/ext/date/zonetab.list
index 1a233071be..e4b67ad81e 100644
--- a/ext/date/zonetab.list
+++ b/ext/date/zonetab.list
@@ -3,7 +3,7 @@ struct zone {
     int name;
     int offset;
 };
-static inline const struct zone *zonetab();
+
 %}
 
 struct zone;
-- 
cgit v1.2.3