nobu	2016-06-08 14:41:08 +0900 (Wed, 08 Jun 2016)

  New Revision: 55322

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55322

  Log:
    fix date build
    
    * common.mk (zonetabl.h): fix typo.
    
    * ext/date/zonetab.list: remove forward declaration which may be
      conflict with the later definition.

  Modified files:
    trunk/common.mk
    trunk/ext/date/zonetab.h
    trunk/ext/date/zonetab.list
Index: common.mk
===================================================================
--- common.mk	(revision 55321)
+++ common.mk	(revision 55322)
@@ -789,7 +789,7 @@ EXT_SRCS = $(srcdir)/ext/ripper/ripper.c https://github.com/ruby/ruby/blob/trunk/common.mk#L789
 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: $(sr https://github.com/ruby/ruby/blob/trunk/common.mk#L891
 	$(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)"
Index: ext/date/zonetab.h
===================================================================
--- ext/date/zonetab.h	(revision 55321)
+++ ext/date/zonetab.h	(revision 55322)
@@ -35,7 +35,7 @@ struct zone { https://github.com/ruby/ruby/blob/trunk/ext/date/zonetab.h#L35
     int name;
     int offset;
 };
-static inline const struct zone *zonetab();
+
 #line 9 "zonetab.list"
 struct zone;
 /* maximum key range = 434, duplicates = 0 */
Index: ext/date/zonetab.list
===================================================================
--- ext/date/zonetab.list	(revision 55321)
+++ ext/date/zonetab.list	(revision 55322)
@@ -3,7 +3,7 @@ struct zone { https://github.com/ruby/ruby/blob/trunk/ext/date/zonetab.list#L3
     int name;
     int offset;
 };
-static inline const struct zone *zonetab();
+
 %}
 
 struct zone;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/