summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-10 13:25:34 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-10 13:25:34 +0000
commit4d763fb8eedb279cb8ccd1e6757ca94f9ac2d7f2 (patch)
tree91ef428aa34cd8e2677de37b0d9f066c42bc561c
parent436a136b4e2b983fb4875ccca466278461e0d7e3 (diff)
* encoding.c: include util.h. [ruby-dev:35715]
* common.mk: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--common.mk2
-rw-r--r--encoding.c1
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 82dc9d0552..770e6dfd37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug 10 22:24:24 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * encoding.c: include util.h. [ruby-dev:35715]
+
+ * common.mk: ditto.
+
Sun Aug 10 20:59:54 2008 Tanaka Akira <akr@fsij.org>
* transcode_data.h (rb_transcoding): new field: flags.
diff --git a/common.mk b/common.mk
index 79ebf92c1d..3681c7195a 100644
--- a/common.mk
+++ b/common.mk
@@ -449,7 +449,7 @@ dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c \
{$(VPATH)}encoding.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
{$(VPATH)}encoding.h {$(VPATH)}oniguruma.h {$(VPATH)}regenc.h
-encoding.$(OBJEXT): dmyencoding.$(OBJEXT)
+encoding.$(OBJEXT): dmyencoding.$(OBJEXT) {$(VPATH)}util.h
enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) \
{$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}util.h
enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \
diff --git a/encoding.c b/encoding.c
index e0f2bc9154..a6d0fcd3d7 100644
--- a/encoding.c
+++ b/encoding.c
@@ -16,6 +16,7 @@
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
#endif
+#include "ruby/util.h"
static ID id_encoding, id_base_encoding;
VALUE rb_cEncoding;