summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--parse.y1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dd1f28af64..4d81330115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Mon May 16 22:28:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon May 16 22:40:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
to get rid of redefinition warnings on mingw.
@@ -6,6 +6,9 @@ Mon May 16 22:28:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* class.c (rb_class_init_copy): singleton class is disallowed to copy,
from its definition. fixed: [ruby-talk:142749]
+ * parse.y (pragma_encoding): add prototype to suppress false warning
+ by VC.
+
Mon May 16 03:29:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.{h,c}: define rb_{p,g,u}id_t.
diff --git a/parse.y b/parse.y
index 60a023fe37..3519f72595 100644
--- a/parse.y
+++ b/parse.y
@@ -5349,6 +5349,7 @@ lvar_defined_gen(parser, id)
/* emacsen -*- hack */
typedef void (*rb_pragma_setter_t) _((struct parser_params *parser, const char *name, const char *val));
+static void pragma_encoding _((struct parser_params *, const char *, const char *));
static void
pragma_encoding(parser, name, val)
struct parser_params *parser;