aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-06 08:44:07 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-06 08:44:07 +0000
commit957ec6fcc81d603216ace1e2366bb841efbf959e (patch)
tree731abfa41803e10b667231de3e33e694723bfa1b
parent1f6a7c18f59a0547bd11a9b355376d2d6fd6e406 (diff)
downloadruby-957ec6fcc81d603216ace1e2366bb841efbf959e.tar.gz
* ext/syck/rubyext.c (mktime_do): remove unused variable offset.
* ext/syck/syck.h: use #ifdef instead of #if DEBUG. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/syck/rubyext.c1
-rw-r--r--ext/syck/syck.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a1bb0e01a..46fe484e53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 6 17:43:07 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/syck/rubyext.c (mktime_do): remove unused variable offset.
+
+ * ext/syck/syck.h: use #ifdef instead of #if DEBUG.
+
Fri May 6 16:27:33 2011 NARUSE, Yui <naruse@ruby-lang.org>
* ext/date/date_core.c (DAY_IN_NANOSECONDS): refix: 31438.
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index 970b64ed05..b234efdfad 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -274,7 +274,6 @@ mktime_do(VALUE varg)
{
char padded[] = "000000.000000";
const int padding = 6;
- const int offset = padding + 1;
const char *end = ptr + 1;
const char *begin = end;
int length;
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
index 7fd97f1b0a..8885b000de 100644
--- a/ext/syck/syck.h
+++ b/ext/syck/syck.h
@@ -30,7 +30,7 @@ extern "C" {
#include <alloca.h>
#endif
-#if DEBUG
+#ifdef DEBUG
void syck_assert( const char *, unsigned, const char * );
# define ASSERT(f) \
(( f ) ? (void)0 : syck_assert( __FILE__, __LINE__, #f ))