* gc.c (ruby_xmalloc2): change check for integer overflow.

  [ruby-dev:27399]

* gc.c (ruby_xrealloc2): ditto.

* eval.c (exec_under): avoid accessing ruby_frame->prev.
  [ruby-dev:27948]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9647 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/ruby.h b/ruby.h
index 1fcf276a21..91a0e619ab 100644
--- a/ruby.h
+++ b/ruby.h
@@ -41,8 +41,6 @@ extern "C" {
 #define PRINTF_ARGS(decl, string_index, first_to_check) decl
 #endif
 
-#include "defines.h"
-
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
@@ -60,6 +58,8 @@ extern "C" {
 #include <stddef.h>
 #include <stdio.h>
 
+#include "defines.h"
+
 /* need to include <ctype.h> to use these macros */
 #ifndef ISPRINT
 #define ISASCII(c) isascii((int)(unsigned char)(c))