summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-07 09:01:27 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-07 09:01:27 +0000
commit1293d0dbc6416cf9f05eee9a0c36eae83dd34ad3 (patch)
tree6864b45f2703f633701190581f5de3fa7b6d69b5
parente382f7f00ebf19497c4956ef7744381eba875d43 (diff)
* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move incluion of config.h to pacify AIX. a patch from Yutaka Kanemoto <kinpoco at gmail.com>. [ruby-dev:29197] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog12
-rw-r--r--ext/bigdecimal/bigdecimal.c2
-rw-r--r--ext/digest/rmd160/rmd160ossl.c2
-rw-r--r--ext/digest/sha1/sha1ossl.c2
-rw-r--r--ext/readline/readline.c1
-rw-r--r--ext/syck/syck.c3
6 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b0863e082f..6343b39a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Aug 7 17:56:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
+ ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
+ incluion of config.h to pacify AIX. a patch from Yutaka
+ Kanemoto <kinpoco at gmail.com>. [ruby-dev:29197]
+
+Mon Aug 7 15:55:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/syck/syck.c (syck_move_tokens): should avoid negative
+ memmove. [ruby-list:42625]
+
Mon Aug 7 14:51:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/date/format.rb: specify maximum number of digits to parse
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 4de5672457..eb0d2b390d 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -13,6 +13,7 @@
*
*/
+#include "ruby.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -20,7 +21,6 @@
#include <errno.h>
#include <float.h>
#include <math.h>
-#include "ruby.h"
#include "math.h"
#include "version.h"
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
index be66d81ff9..2989ffd00e 100644
--- a/ext/digest/rmd160/rmd160ossl.c
+++ b/ext/digest/rmd160/rmd160ossl.c
@@ -1,7 +1,7 @@
/* $Id$ */
-#include "rmd160ossl.h"
#include "defs.h"
+#include "rmd160ossl.h"
#include <assert.h>
#include <stdlib.h>
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
index b125128f82..82a4f6f057 100644
--- a/ext/digest/sha1/sha1ossl.c
+++ b/ext/digest/sha1/sha1ossl.c
@@ -1,7 +1,7 @@
/* $Id$ */
-#include "sha1ossl.h"
#include "defs.h"
+#include "sha1ossl.h"
#include <assert.h>
#include <stdlib.h>
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index f6dc6b67ed..bc2241007f 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -5,6 +5,7 @@
#include RUBY_EXTCONF_H
#endif
+#include "config.h"
#include <errno.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
index 20b124ab28..daf531632f 100644
--- a/ext/syck/syck.c
+++ b/ext/syck/syck.c
@@ -412,7 +412,8 @@ syck_move_tokens( SyckParser *p )
skip = p->limit - p->token;
if ( ( count = p->token - p->buffer ) )
{
- S_MEMMOVE( p->buffer, p->token, char, skip );
+ if (skip > 0)
+ S_MEMMOVE( p->buffer, p->token, char, skip );
p->token = p->buffer;
p->marker -= count;
p->cursor -= count;