1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
nobu 2016-06-08 05:41:08 +00:00
parent 9a4a04fe15
commit cebc948747
3 changed files with 4 additions and 4 deletions

View file

@ -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)"

View file

@ -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 */

View file

@ -3,7 +3,7 @@ struct zone {
int name;
int offset;
};
static inline const struct zone *zonetab();
%}
struct zone;