* eval.c (rb_mod_modfunc): should break if m has no super class.

  [ruby-dev:22498]

* backport changes from 1.9


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

1 files changed, 10 insertions, 4 deletions

diff --git a/pack.c b/pack.c
index 4763c81c29..4edffd3801 100644
--- a/pack.c
+++ b/pack.c
@@ -22,12 +22,14 @@
 #endif
 
 #ifdef NATINT_PACK
+# define OFF16B(p) ((char*)(p) + (natint?0:(sizeof(short) - SIZE16)))
+# define OFF32B(p) ((char*)(p) + (natint?0:(sizeof(long) - SIZE32)))
 # define NATINT_I32(x) (natint?NUM2LONG(x):(NUM2I32(x)))
 # define NATINT_U32(x) (natint?NUM2ULONG(x):(NUM2U32(x)))
 # define NATINT_LEN(type,len) (natint?sizeof(type):(len))
 # ifdef WORDS_BIGENDIAN
-#   define OFF16(p) ((char*)(p) + (natint?0:(sizeof(short) - SIZE16)))
-#   define OFF32(p) ((char*)(p) + (natint?0:(sizeof(long) - SIZE32)))
+#   define OFF16(p) OFF16B(p)
+#   define OFF32(p) OFF32B(p)
 # endif
 # define NATINT_HTOVS(x) (natint?htovs(x):htov16(x))
 # define NATINT_HTOVL(x) (natint?htovl(x):htov32(x))
@@ -47,6 +49,10 @@
 # define OFF16(p) (char*)(p)
 # define OFF32(p) (char*)(p)
 #endif
+#ifndef OFF16B
+# define OFF16B(p) (char*)(p)
+# define OFF32B(p) (char*)(p)
+#endif
 
 #define define_swapx(x, xtype)		\
 static xtype				\
@@ -1648,7 +1654,7 @@ pack_unpack(str, fmt)
 	    PACK_LENGTH_ADJUST(unsigned short,2);
 	    while (len-- > 0) {
 		unsigned short tmp = 0;
-		memcpy(OFF16(&tmp), s, NATINT_LEN(unsigned short,2));
+		memcpy(OFF16B(&tmp), s, NATINT_LEN(unsigned short,2));
 		s += NATINT_LEN(unsigned short,2);
 		rb_ary_push(ary, UINT2NUM(ntohs(tmp)));
 	    }
@@ -1659,7 +1665,7 @@ pack_unpack(str, fmt)
 	    PACK_LENGTH_ADJUST(unsigned long,4);
 	    while (len-- > 0) {
 		unsigned long tmp = 0;
-		memcpy(OFF32(&tmp), s, NATINT_LEN(unsigned long,4));
+		memcpy(OFF32B(&tmp), s, NATINT_LEN(unsigned long,4));
 		s += NATINT_LEN(unsigned long,4);
 		rb_ary_push(ary, ULONG2NUM(ntohl(tmp)));
 	    }