diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-08 05:41:08 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-08 05:41:08 +0000 |
| commit | f27571b468a67c76f43dbe7969e8b2c5ae391b67 (patch) | |
| tree | 74f929ccebed3aeff2a41b9f77a1416380ab5a21 | |
| parent | ff3e49ba29df3a14ef19cbed6ab22a1b20ec3668 (diff) | |
| download | ruby-f27571b468a67c76f43dbe7969e8b2c5ae391b67.tar.gz | |
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
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | ext/date/zonetab.h | 2 | ||||
| -rw-r--r-- | ext/date/zonetab.list | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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; |