1 files changed, 18 insertions, 10 deletions
diff --git a/ruby.h b/ruby.h
index ac53f620a9..97c751086a 100644
--- a/ruby.h
+++ b/ruby.h
@@ -6,7 +6,7 @@
   $Date$
   created at: Thu Jun 10 14:26:32 JST 1993
 
-  Copyright (C) 1993-1996 Yukihiro Matsumoto
+  Copyright (C) 1993-1998 Yukihiro Matsumoto
 
 *************************************************/
 
@@ -43,6 +43,10 @@
 #include <alloca.h>
 #endif
 
+#if defined(__CYGWIN32__) && defined(DLLIMPORT)
+#include "import.h"
+#endif
+
 #ifdef _AIX
 #pragma alloca
 #endif
@@ -165,20 +169,23 @@ int   num2int _((VALUE));
 double num2dbl _((VALUE));
 #define NUM2DBL(x) num2dbl((VALUE)(x))
 
+char *str2cstr _((VALUE));
+#define STR2CSTR(x) str2cstr((VALUE)(x))
+
 VALUE rb_newobj _((void));
 #define NEWOBJ(obj,type) type *obj = (type*)rb_newobj()
 #define OBJSETUP(obj,c,t) {\
-    RBASIC(obj)->class = (c);\
+    RBASIC(obj)->klass = (c);\
     RBASIC(obj)->flags = (t);\
 }
 #define CLONESETUP(clone,obj) {\
-    OBJSETUP(clone,singleton_class_clone(RBASIC(obj)->class),RBASIC(obj)->flags);\
-    singleton_class_attached(RBASIC(clone)->class, (VALUE)clone);\
+    OBJSETUP(clone,singleton_class_clone(RBASIC(obj)->klass),RBASIC(obj)->flags);\
+    singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);\
 }
 
 struct RBasic {
     UINT flags;
-    VALUE class;
+    VALUE klass;
 };
 
 struct RObject {
@@ -240,14 +247,14 @@ struct RData {
 #define DATA_PTR(dta) (RDATA(dta)->data)
 
 VALUE data_object_alloc _((VALUE,void*,void (*)(),void (*)()));
-#define Data_Make_Struct(class,type,mark,free,sval) (\
+#define Data_Make_Struct(klass,type,mark,free,sval) (\
     sval = ALLOC(type),\
     memset(sval, 0, sizeof(type)),\
-    data_object_alloc(class,sval,mark,free)\
+    data_object_alloc(klass,sval,mark,free)\
 )
 
-#define Data_Wrap_Struct(class,mark,free,sval) (\
-    data_object_alloc(class,sval,mark,free)\
+#define Data_Wrap_Struct(klass,mark,free,sval) (\
+    data_object_alloc(klass,sval,mark,free)\
 )
 
 #define Data_Get_Struct(obj,type,sval) {\
@@ -268,10 +275,11 @@ struct RBignum {
     USHORT *digits;
 };
 
-#define R_CAST(st) (struct st*)
+#define R_CAST(st)   (struct st*)
 #define RBASIC(obj)  (R_CAST(RBasic)(obj))
 #define ROBJECT(obj) (R_CAST(RObject)(obj))
 #define RCLASS(obj)  (R_CAST(RClass)(obj))
+#define RMODULE(obj) RCLASS(obj)
 #define RFLOAT(obj)  (R_CAST(RFloat)(obj))
 #define RSTRING(obj) (R_CAST(RString)(obj))
 #define RREGEXP(obj) (R_CAST(RRegexp)(obj))