* re.c (rb_reg_match): should clear $~ if operand is nil.

* re.c (rb_reg_match2): ditto.

* configure: merge Jonathan Baker's large file support patch
  [ruby-talk:35316], with read_all patch in [ruby-talk:35470].

* eval.c (rb_f_abort): optional message argument that be printed
  on termination. [new]


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

1 files changed, 1 insertions, 2 deletions

diff --git a/defines.h b/defines.h
index c2b3dce685..d8b7242daa 100644
--- a/defines.h
+++ b/defines.h
@@ -56,10 +56,9 @@ void *xrealloc _((void*,long));
 void xfree _((void*));
 
 #if SIZEOF_LONG_LONG > 0
-# define HAVE_LONG_LONG
 # define LONG_LONG long long
 #elif SIZEOF___INT64 > 0
-# define HAVE_LONG_LONG
+# define HAVE_LONG_LONG 1
 # define LONG_LONG __int64
 # undef SIZEOF_LONG_LONG
 # define SIZEOF_LONG_LONG SIZEOF___INT64