diff -ur ruby-1.6.4/array.c spin-1.6.4/array.c
--- ruby-1.6.4/array.c	Wed May 16 15:01:14 2001
+++ spin-1.6.4/array.c	Tue Jun  5 17:15:44 2001
@@ -16,9 +16,23 @@
 #include "util.h"
 #include "st.h"
 
-VALUE rb_cArray;
+ap_rb_var(cArray)
 
 #define ARY_DEFAULT_SIZE 16
+
+VALUE *
+ap_ary_ptr(ary)
+    VALUE ary;
+{
+    return RARRAY(ary)->ptr;
+}
+
+int
+ap_ary_len(ary)
+    VALUE ary;
+{
+    return RARRAY(ary)->len;
+}
 
 void
 rb_mem_clear(mem, size)
diff -ur ruby-1.6.4/bignum.c spin-1.6.4/bignum.c
--- ruby-1.6.4/bignum.c	Mon May 21 13:21:18 2001
+++ spin-1.6.4/bignum.c	Tue Jun  5 17:15:44 2001
@@ -14,7 +14,7 @@
 #include <math.h>
 #include <ctype.h>
 
-VALUE rb_cBignum;
+ap_rb_var(cBignum)
 
 #if defined __MINGW32__
 #define USHORT _USHORT
diff -ur ruby-1.6.4/compar.c spin-1.6.4/compar.c
--- ruby-1.6.4/compar.c	Wed Mar 21 17:04:12 2001
+++ spin-1.6.4/compar.c	Tue Jun  5 17:15:44 2001
@@ -12,7 +12,7 @@
 
 #include "ruby.h"
 
-VALUE rb_mComparable;
+ap_rb_var(mComparable)
 
 static ID cmp;
 
diff -ur ruby-1.6.4/dir.c spin-1.6.4/dir.c
--- ruby-1.6.4/dir.c	Mon May 28 16:34:20 2001
+++ spin-1.6.4/dir.c	Tue Jun  5 17:15:44 2001
@@ -225,7 +225,7 @@
     return !*s ? 0 : FNM_NOMATCH;
 }
 
-VALUE rb_cDir;
+ap_rb_var(cDir)
 
 static void
 free_dir(dir)
Only in spin-1.6.4: dir.c.orig
diff -ur ruby-1.6.4/dln.c spin-1.6.4/dln.c
--- ruby-1.6.4/dln.c	Fri Jun  1 11:34:50 2001
+++ spin-1.6.4/dln.c	Tue Jun  5 17:15:44 2001
@@ -1233,7 +1233,10 @@
     /* Load the file as an object one */
     init_funcname(buf, file);
 
-    strcpy(winfile, file);
+    {
+	char* tmp;
+	GetFullPathNameA(file, MAXPATHLEN, winfile, &tmp);
+    }
 
     /* Load file */
     if ((handle =
@@ -1538,10 +1541,10 @@
     const char *path;
 {
 #ifndef __MACOS__
-    if (!path) path = ".";
+    if (!path) return fname;
     return dln_find_1(fname, path, 0);
 #else
-    if (!path) path = ".";
+    if (!path) return fname;
     return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, 0));
 #endif
 }
Only in spin-1.6.4: dln.c.orig
diff -ur ruby-1.6.4/enum.c spin-1.6.4/enum.c
--- ruby-1.6.4/enum.c	Wed Mar 21 17:04:12 2001
+++ spin-1.6.4/enum.c	Tue Jun  5 17:15:44 2001
@@ -13,7 +13,7 @@
 #include "ruby.h"
 #include "node.h"
 
-VALUE rb_mEnumerable;
+ap_rb_var(mEnumerable)
 static ID id_each, id_eqq, id_cmp;
 
 VALUE
diff -ur ruby-1.6.4/error.c spin-1.6.4/error.c
--- ruby-1.6.4/error.c	Wed Mar 21 17:04:12 2001
+++ spin-1.6.4/error.c	Tue Jun  5 17:15:44 2001
@@ -248,28 +248,28 @@
 /* exception classes */
 #include <errno.h>
 
-VALUE rb_eException;
-VALUE rb_eSystemExit;
-VALUE rb_eInterrupt;
-VALUE rb_eSignal;
-VALUE rb_eFatal;
-VALUE rb_eStandardError;
-VALUE rb_eRuntimeError;
-VALUE rb_eTypeError;
-VALUE rb_eArgError;
-VALUE rb_eIndexError;
-VALUE rb_eRangeError;
-VALUE rb_eSecurityError;
-VALUE rb_eNotImpError;
-VALUE rb_eNoMemError;
-
-VALUE rb_eScriptError;
-VALUE rb_eNameError;
-VALUE rb_eSyntaxError;
-VALUE rb_eLoadError;
+ap_rb_var(eException)
+ap_rb_var(eSystemExit)
+ap_rb_var(eInterrupt)
+ap_rb_var(eSignal)
+ap_rb_var(eFatal)
+ap_rb_var(eStandardError)
+ap_rb_var(eRuntimeError)
+ap_rb_var(eTypeError)
+ap_rb_var(eArgError)
+ap_rb_var(eIndexError)
+ap_rb_var(eRangeError)
+ap_rb_var(eSecurityError)
+ap_rb_var(eNotImpError)
+ap_rb_var(eNoMemError)
+
+ap_rb_var(eScriptError)
+ap_rb_var(eNameError)
+ap_rb_var(eSyntaxError)
+ap_rb_var(eLoadError)
 
-VALUE rb_eSystemCallError;
-VALUE rb_mErrno;
+ap_rb_var(eSystemCallError)
+ap_rb_var(mErrno)
 
 VALUE
 rb_exc_new(etype, ptr, len)
@@ -1103,7 +1103,7 @@
 err_append(s)
     const char *s;
 {
-    extern VALUE ruby_errinfo;
+    extern VALUE ruby_errinfo, rb_stderr;
 
     if (ruby_in_eval) {
 	if (NIL_P(ruby_errinfo)) {
@@ -1118,8 +1118,8 @@
 	}
     }
     else {
-	fputs(s, stderr);
-	fputs("\n", stderr);
-	fflush(stderr);
+	rb_io_write(rb_stderr, rb_str_new2(s));
+	rb_io_write(rb_stderr, rb_str_new2("\n"));
+	rb_io_flush(rb_stderr);
     }
 }
diff -ur ruby-1.6.4/eval.c spin-1.6.4/eval.c
--- ruby-1.6.4/eval.c	Tue May 29 17:59:36 2001
+++ spin-1.6.4/eval.c	Tue Jun  5 17:15:44 2001
@@ -97,7 +97,7 @@
 
 #include <sys/stat.h>
 
-VALUE rb_cProc;
+ap_rb_var(cProc)
 static VALUE rb_cBinding;
 static VALUE proc_call _((VALUE,VALUE));
 static VALUE rb_f_binding _((VALUE));
@@ -490,6 +490,17 @@
 extern int ruby_in_compile;
 
 VALUE ruby_errinfo = Qnil;
+VALUE
+ap_errinfo()
+{
+	return ruby_errinfo;
+}
+void
+ap_set_errinfo(v)
+    VALUE v;
+{
+	ruby_errinfo = v;
+}
 extern NODE *ruby_eval_tree_begin;
 extern NODE *ruby_eval_tree;
 extern int ruby_nerrs;
@@ -5116,7 +5127,7 @@
     return specific_eval(argc, argv, mod, mod);
 }
 
-VALUE rb_load_path;
+ap_rb_var(load_path)
 
 void
 rb_load(fname, wrap)
@@ -5137,7 +5148,7 @@
     else {
 	Check_SafeStr(fname);
     }
-    file = rb_find_file(RSTRING(fname)->ptr);
+    file = ap_find_file(RSTRING(fname)->ptr, !(wrap & 0x10));
     if (!file) {
 	rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr);
     }
@@ -5147,7 +5158,7 @@
     PUSH_CLASS();
     wrapper = ruby_wrapper;
     ruby_cref = top_cref;
-    if (!wrap) {
+    if (!(wrap & 0x01)) {
 	rb_secure(4);		/* should alter global state */
 	ruby_class = rb_cObject;
 	ruby_wrapper = 0;
@@ -6876,7 +6887,7 @@
 
 int rb_thread_pending = 0;
 
-VALUE rb_cThread;
+ap_rb_var(cThread)
 
 extern VALUE rb_last_status;
 
@@ -8363,6 +8374,13 @@
 }
 
 int rb_thread_critical;
+
+void
+ap_thread_critical(i)
+    int i;
+{
+    rb_thread_critical = i;
+}
 
 static VALUE
 rb_thread_critical_get()
Only in spin-1.6.4: eval.c.orig
diff -ur ruby-1.6.4/file.c spin-1.6.4/file.c
--- ruby-1.6.4/file.c	Fri Jun  1 15:46:10 2001
+++ spin-1.6.4/file.c	Tue Jun  5 17:15:44 2001
@@ -70,8 +70,8 @@
 #define lstat rb_sys_stat
 #endif
  
-VALUE rb_cFile;
-VALUE rb_mFileTest;
+ap_rb_var(cFile)
+ap_rb_var(mFileTest)
 static VALUE rb_cStat;
 
 static int
@@ -2125,8 +2125,9 @@
 #endif
 
 char*
-rb_find_file(file)
+ap_find_file(file, load_path_enabled)
     char *file;
+    int load_path_enabled;
 {
     extern VALUE rb_load_path;
     volatile VALUE vpath;
@@ -2169,7 +2170,7 @@
 	file = STR2CSTR(fname);
     }
 
-    if (rb_load_path) {
+    if (rb_load_path && load_path_enabled) {
 	int i;
 
 	Check_Type(rb_load_path, T_ARRAY);
@@ -2196,6 +2197,13 @@
 	return path;
     }
     return 0;
+}
+
+char*
+rb_find_file(file)
+    char *file;
+{
+    return ap_find_file(file, 1);
 }
 
 static void
Only in spin-1.6.4: file.c.orig
diff -ur ruby-1.6.4/gc.c spin-1.6.4/gc.c
--- ruby-1.6.4/gc.c	Tue May  1 17:45:12 2001
+++ spin-1.6.4/gc.c	Tue Jun  5 17:15:44 2001
@@ -156,6 +156,14 @@
 	RUBY_CRITICAL(free(x));
 }
 
+void *
+ap_data_get_struct(obj)
+    VALUE obj;
+{
+    Check_Type(obj, T_DATA);
+    return DATA_PTR(obj);
+}
+
 extern int ruby_in_compile;
 static int dont_gc;
 static int during_gc;
@@ -180,7 +188,7 @@
     return old;
 }
 
-VALUE rb_mGC;
+ap_rb_var(mGC)
 
 static struct gc_list {
     VALUE *varptr;
diff -ur ruby-1.6.4/hash.c spin-1.6.4/hash.c
--- ruby-1.6.4/hash.c	Fri Jun  1 18:38:30 2001
+++ spin-1.6.4/hash.c	Tue Jun  5 17:15:44 2001
@@ -19,6 +19,13 @@
 
 #define HASH_DELETED  FL_USER1
 
+VALUE
+ap_hash_ifnone(hash)
+    VALUE hash;
+{
+    return RHASH(hash)->ifnone;
+}
+
 static void
 rb_hash_modify(hash)
     VALUE hash;
@@ -35,7 +42,7 @@
     return rb_obj_freeze(hash);
 }
 
-VALUE rb_cHash;
+ap_rb_var(cHash)
 
 static VALUE envtbl;
 static ID hash;
diff -ur ruby-1.6.4/intern.h spin-1.6.4/intern.h
--- ruby-1.6.4/intern.h	Tue May  1 17:45:12 2001
+++ spin-1.6.4/intern.h	Tue Jun  5 17:15:44 2001
@@ -179,6 +179,7 @@
 int eaccess _((const char*, int));
 VALUE rb_file_s_expand_path _((int, VALUE *));
 void rb_file_const _((const char*, VALUE));
+char *ap_find_file _((char*, int));
 char *rb_find_file _((char*));
 /* gc.c */
 void rb_gc_mark_locations _((VALUE*, VALUE*));
@@ -205,6 +206,7 @@
 EXTERN VALUE rb_default_rs;
 EXTERN VALUE rb_output_rs;
 VALUE rb_io_write _((VALUE, VALUE));
+VALUE rb_io_flush _((VALUE));
 VALUE rb_io_gets _((VALUE));
 VALUE rb_io_getc _((VALUE));
 VALUE rb_io_ungetc _((VALUE, VALUE));
diff -ur ruby-1.6.4/io.c spin-1.6.4/io.c
--- ruby-1.6.4/io.c	Tue Apr 17 17:26:14 2001
+++ spin-1.6.4/io.c	Tue Jun  5 17:15:44 2001
@@ -79,17 +79,20 @@
 
 #include "util.h"
 
-VALUE rb_cIO;
-VALUE rb_eEOFError;
-VALUE rb_eIOError;
-
-VALUE rb_stdin, rb_stdout, rb_stderr, rb_defout;
+ap_rb_var(cIO)
+ap_rb_var(eEOFError)
+ap_rb_var(eIOError)
+
+ap_rb_var(stdin)
+ap_rb_var(stdout)
+ap_rb_var(stderr)
+ap_rb_var(defout)
 static VALUE orig_stdin, orig_stdout, orig_stderr;
 
-VALUE rb_output_fs;
-VALUE rb_rs;
-VALUE rb_output_rs;
-VALUE rb_default_rs;
+ap_rb_var(output_fs)
+ap_rb_var(rs)
+ap_rb_var(output_rs)
+ap_rb_var(default_rs)
 
 static VALUE argf;
 
@@ -283,7 +286,7 @@
     return io;
 }
 
-static VALUE
+VALUE
 rb_io_flush(io)
     VALUE io;
 {
@@ -2210,6 +2213,13 @@
     rb_defout = val;
 }
 
+void
+ap_set_defout(val)
+    VALUE val;
+{
+    rb_io_defset(val, 0);
+}
+
 static void
 set_stdin(val, id, var)
     VALUE val;
@@ -2234,6 +2244,15 @@
     *var = val;
 }
 
+void
+ap_set_stdin(val)
+    VALUE val;
+{
+    if (current_file == rb_stdin)
+	current_file = val;
+    rb_stdin = val;
+}
+
 static void
 set_outfile(val, var, orig, stdf)
     VALUE val;
@@ -2281,6 +2300,20 @@
     VALUE *var;
 {
     set_outfile(val, var, orig_stderr, stderr);
+}
+
+void
+ap_set_stdout(val)
+    VALUE val;
+{
+    rb_stdout = val;
+}
+
+void
+ap_set_stderr(val)
+    VALUE val;
+{
+    rb_stderr = val;
 }
 
 static VALUE
diff -ur ruby-1.6.4/math.c spin-1.6.4/math.c
--- ruby-1.6.4/math.c	Wed Mar 21 17:04:12 2001
+++ spin-1.6.4/math.c	Tue Jun  5 17:15:44 2001
@@ -13,7 +13,7 @@
 #include "ruby.h"
 #include <math.h>
 
-VALUE rb_mMath;
+ap_rb_var(mMath)
 
 #define Need_Float(x) (x) = rb_Float(x)
 #define Need_Float2(x,y) {\
diff -ur ruby-1.6.4/numeric.c spin-1.6.4/numeric.c
--- ruby-1.6.4/numeric.c	Tue Apr 24 15:44:14 2001
+++ spin-1.6.4/numeric.c	Tue Jun  5 17:15:44 2001
@@ -20,13 +20,13 @@
 static ID coerce;
 static ID to_i;
 
-VALUE rb_cNumeric;
-VALUE rb_cFloat;
-VALUE rb_cInteger;
-VALUE rb_cFixnum;
+ap_rb_var(cNumeric)
+ap_rb_var(cFloat)
+ap_rb_var(cInteger)
+ap_rb_var(cFixnum)
 
-VALUE rb_eZeroDivError;
-VALUE rb_eFloatDomainError;
+ap_rb_var(eZeroDivError)
+ap_rb_var(eFloatDomainError)
 
 void
 rb_num_zerodiv()
diff -ur ruby-1.6.4/object.c spin-1.6.4/object.c
--- ruby-1.6.4/object.c	Fri Jun  1 15:46:10 2001
+++ spin-1.6.4/object.c	Tue Jun  5 17:15:44 2001
@@ -17,16 +17,16 @@
 #include <stdio.h>
 #include <errno.h>
 
-VALUE rb_mKernel;
-VALUE rb_cObject;
-VALUE rb_cModule;
-VALUE rb_cClass;
-VALUE rb_cData;
+ap_rb_var(mKernel)
+ap_rb_var(cObject)
+ap_rb_var(cModule)
+ap_rb_var(cClass)
+ap_rb_var(cData)
 
-VALUE rb_cNilClass;
-VALUE rb_cTrueClass;
-VALUE rb_cFalseClass;
-VALUE rb_cSymbol;
+ap_rb_var(cNilClass)
+ap_rb_var(cTrueClass)
+ap_rb_var(cFalseClass)
+ap_rb_var(cSymbol)
 
 VALUE rb_f_sprintf();
 VALUE rb_obj_alloc();
diff -ur ruby-1.6.4/parse.c spin-1.6.4/parse.c
--- ruby-1.6.4/parse.c	Mon May 14 16:35:50 2001
+++ spin-1.6.4/parse.c	Tue Jun  5 17:15:44 2001
@@ -132,6 +132,16 @@
 char *ruby_sourcefile;		/* current source file */
 int   ruby_sourceline;		/* current line no. */
 
+char *ap_sourcefile(void)
+{
+    return ruby_sourcefile;
+}
+
+int   ap_sourceline(void)
+{
+    return ruby_sourceline;
+}
+
 static int yylex();
 static int yyerror();
 
diff -ur ruby-1.6.4/prec.c spin-1.6.4/prec.c
--- ruby-1.6.4/prec.c	Wed Mar 21 17:04:12 2001
+++ spin-1.6.4/prec.c	Tue Jun  5 17:15:44 2001
@@ -12,7 +12,7 @@
 
 #include "ruby.h"
 
-VALUE rb_mPrecision;
+ap_rb_var(mPrecision)
 
 static ID prc_pr, prc_if;
 
diff -ur ruby-1.6.4/process.c spin-1.6.4/process.c
--- ruby-1.6.4/process.c	Tue May 15 17:47:28 2001
+++ spin-1.6.4/process.c	Tue Jun  5 17:15:44 2001
@@ -1058,7 +1058,7 @@
     return egid;
 }
 
-VALUE rb_mProcess;
+ap_rb_var(mProcess)
 
 void
 Init_process()
Only in spin-1.6.4: process.c.orig
diff -ur ruby-1.6.4/range.c spin-1.6.4/range.c
--- ruby-1.6.4/range.c	Wed Mar 21 17:04:12 2001
+++ spin-1.6.4/range.c	Tue Jun  5 17:15:44 2001
@@ -12,7 +12,7 @@
 
 #include "ruby.h"
 
-VALUE rb_cRange;
+ap_rb_var(cRange)
 static ID id_cmp, id_beg, id_end, id_excl;
 
 #define EXCL(r) RTEST(rb_ivar_get((r), id_excl))
diff -ur ruby-1.6.4/re.c spin-1.6.4/re.c
--- ruby-1.6.4/re.c	Wed Mar 21 17:04:12 2001
+++ spin-1.6.4/re.c	Tue Jun  5 17:15:44 2001
@@ -799,7 +799,7 @@
     return RMATCH(match)->str;	/* str is frozen */
 }
 
-VALUE rb_cRegexp;
+ap_rb_var(cRegexp)
 
 static void
 rb_reg_initialize(obj, s, len, options)
diff -ur ruby-1.6.4/ruby.c spin-1.6.4/ruby.c
--- ruby-1.6.4/ruby.c	Fri Jun  1 15:46:10 2001
+++ spin-1.6.4/ruby.c	Tue Jun  5 17:25:12 2001
@@ -206,32 +206,20 @@
 #define LOAD_RELATIVE 1
 #endif
 
+#if defined LOAD_RELATIVE
 void
-ruby_init_loadpath()
+ruby_init_loadpath_relative(path)
+    const char *path;
 {
-#if defined LOAD_RELATIVE
     char libpath[FILENAME_MAX+1];
     char *p;
     int rest;
-#if defined _WIN32 || defined __CYGWIN__
-# if defined LIBRUBY_SO
-    HMODULE libruby = GetModuleHandle(LIBRUBY_SO);
-# else
-    HMODULE libruby = NULL;
-# endif
-    GetModuleFileName(libruby, libpath, sizeof libpath);
-#elif defined(DJGPP)
-    extern char *__dos_argv0;
-    strncpy(libpath, __dos_argv0, FILENAME_MAX);
-#define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
-#elif defined(__EMX__)
-    _execname(libpath, FILENAME_MAX);
-#endif
-
+    int bin_dir = 0;
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
 #define CharNext(p) ((p) + 1)
 #endif
 
+    strcpy(libpath, path);
     for (p = libpath; *p; p = CharNext(p))
 	if (*p == '\\')
 	    *p = '/';
@@ -240,6 +228,7 @@
     if (p) {
 	*p = 0;
 	if (p-libpath > 3 && !strcasecmp(p-4, "/bin")) {
+	    bin_dir = 1;
 	    p -= 4;
 	    *p = 0;
 	}
@@ -251,7 +240,13 @@
     rest = FILENAME_MAX - (p - libpath);
 
 #define RUBY_RELATIVE(path) (strncpy(p, (path), rest), libpath)
+    if (bin_dir) {
+	ruby_incpush(RUBY_RELATIVE("/bin"));
+    }
 #else
+void
+ruby_init_loadpath()
+{
 #define RUBY_RELATIVE(path) (path)
 #endif
 
@@ -282,6 +277,29 @@
     }
 }
 
+#if defined LOAD_RELATIVE
+void
+ruby_init_loadpath()
+{
+    char libpath[FILENAME_MAX+1];
+#if defined _WIN32 || defined __CYGWIN__
+# if defined LIBRUBY_SO
+    HMODULE libruby = GetModuleHandle(LIBRUBY_SO);
+# else
+    HMODULE libruby = NULL;
+# endif
+    GetModuleFileName(libruby, libpath, sizeof libpath);
+#elif defined(DJGPP)
+    extern char *__dos_argv0;
+    strncpy(libpath, __dos_argv0, FILENAME_MAX);
+#define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
+#elif defined(__EMX__)
+    _execname(libpath, FILENAME_MAX);
+#endif
+    ruby_init_loadpath_relative(libpath);
+}
+#endif
+
 struct req_list {
     char *name;
     struct req_list *next;
@@ -868,9 +886,9 @@
     load_file("-", 1);
 }
 
-VALUE rb_progname;
-VALUE rb_argv;
-VALUE rb_argv0;
+ap_rb_var(progname)
+ap_rb_var(argv)
+ap_rb_var(argv0)
 
 static void
 set_arg0(val, id)
@@ -1037,4 +1055,22 @@
     if (do_loop) {
 	rb_parser_while_loop(do_line, do_split);
     }
+}
+
+VALUE
+ap_class_of(VALUE obj)
+{
+    return rb_class_of(obj);
+}
+
+int
+ap_type(VALUE obj)
+{
+    return rb_type(obj);
+}
+
+int
+ap_special_const_p(VALUE obj)
+{
+    return rb_special_const_p(obj);
 }
Only in spin-1.6.4: ruby.c.orig
diff -ur ruby-1.6.4/ruby.h spin-1.6.4/ruby.h
--- ruby-1.6.4/ruby.h	Tue Mar 27 03:13:58 2001
+++ spin-1.6.4/ruby.h	Tue Jun  5 17:15:44 2001
@@ -381,6 +381,10 @@
 #define xrealloc ruby_xrealloc
 #define xfree ruby_xfree
 
+#define ap_rb_var(id) \
+  VALUE rb_##id; \
+  VALUE ap_##id() { return rb_##id; }
+
 void *xmalloc _((long));
 void *xcalloc _((long,long));
 void *xrealloc _((void*,long));
@@ -559,6 +563,8 @@
     return RBASIC(obj)->klass;
 }
 
+VALUE ap_class_of _((VALUE));
+
 static inline int
 #if defined(__cplusplus)
 rb_type(VALUE obj)
@@ -576,6 +582,8 @@
     return BUILTIN_TYPE(obj);
 }
 
+int ap_type _((VALUE));
+
 static inline int
 #if defined(__cplusplus)
 rb_special_const_p(VALUE obj)
@@ -587,6 +595,8 @@
     if (SPECIAL_CONST_P(obj)) return Qtrue;
     return Qfalse;
 }
+
+int ap_special_const_p _((VALUE));
 
 #include "intern.h"
 
diff -ur ruby-1.6.4/string.c spin-1.6.4/string.c
--- ruby-1.6.4/string.c	Sat May 26 00:01:06 2001
+++ spin-1.6.4/string.c	Tue Jun  5 17:15:44 2001
@@ -25,11 +25,25 @@
 #include <unistd.h>
 #endif
 
-VALUE rb_cString;
+ap_rb_var(cString)
 
 #define STR_NO_ORIG FL_USER2
 
 VALUE rb_fs;
+
+char *
+ap_str_ptr(str)
+    VALUE str;
+{
+    return RSTRING(str)->ptr;
+}
+
+int
+ap_str_len(str)
+    VALUE str;
+{
+    return RSTRING(str)->len;
+}
 
 VALUE
 rb_str_new(ptr, len)
diff -ur ruby-1.6.4/struct.c spin-1.6.4/struct.c
--- ruby-1.6.4/struct.c	Wed Mar 21 17:04:12 2001
+++ spin-1.6.4/struct.c	Tue Jun  5 17:15:44 2001
@@ -12,7 +12,7 @@
 
 #include "ruby.h"
 
-VALUE rb_cStruct;
+ap_rb_var(cStruct)
 
 static VALUE struct_alloc _((int, VALUE*, VALUE));
 
@@ -219,6 +219,26 @@
     return make_struct(nm, ary, rb_cStruct);
 }
 
+VALUE
+ap_struct_define(name, ar)
+    const char *name;
+    char **ar;
+{
+    VALUE nm, ary;
+    char *mem;
+
+    if (!name) nm = Qnil;
+    else nm = rb_str_new2(name);
+    ary = rb_ary_new();
+
+    while (mem = *(ar++)) {
+	ID slot = rb_intern(mem);
+	rb_ary_push(ary, ID2SYM(slot));
+    }
+
+    return make_struct(nm, ary, rb_cStruct);
+}
+
 static VALUE
 rb_struct_s_def(argc, argv, klass)
     int argc;
@@ -317,6 +337,23 @@
 	mem[i] = va_arg(args, VALUE);
     }
     va_end(args);
+
+    return struct_alloc(size, mem, klass);
+}
+
+VALUE
+ap_struct_new(klass, args)
+    VALUE klass, *args;
+{
+    VALUE sz, *mem;
+    long size, i;
+
+    sz = iv_get(klass, "__size__");
+    size = FIX2LONG(sz); 
+    mem = ALLOCA_N(VALUE, size);
+    for (i=0; i<size; i++) {
+	mem[i] = args[i];
+    }
 
     return struct_alloc(size, mem, klass);
 }
diff -ur ruby-1.6.4/time.c spin-1.6.4/time.c
--- ruby-1.6.4/time.c	Tue May 15 17:49:22 2001
+++ spin-1.6.4/time.c	Tue Jun  5 17:15:44 2001
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #endif
 
-VALUE rb_cTime;
+ap_rb_var(cTime)
 #if defined(HAVE_TIMES) || defined(NT)
 static VALUE S_Tms;
 #endif
diff -ur ruby-1.6.4/win32/Makefile.sub spin-1.6.4/win32/Makefile.sub
--- ruby-1.6.4/win32/Makefile.sub	Mon Apr 16 15:49:12 2001
+++ spin-1.6.4/win32/Makefile.sub	Wed Jun  6 09:28:12 2001
@@ -30,7 +30,7 @@
 
 
 prefix = /usr
-CFLAGS = -nologo -DNT=1 -Zi -MD -O2b2xg- -G5
+CFLAGS = -nologo -DNT=1 -MD -G5
 CPPFLAGS = -I$(srcdir) -I$(srcdir)/missing
 LDFLAGS = $(CFLAGS) -Fm
 XLDFLAGS = 
diff -ur ruby-1.6.4/win32/config.status.in spin-1.6.4/win32/config.status.in
--- ruby-1.6.4/win32/config.status.in	Mon Apr 16 15:49:12 2001
+++ spin-1.6.4/win32/config.status.in	Wed Jun  6 09:27:54 2001
@@ -1,5 +1,5 @@
 s%@SHELL@%%g
-s%@CFLAGS@%-nologo -DNT=1 -Zi -MD -O2b2x -G5%g
+s%@CFLAGS@%-nologo -DNT=1 -MD -G5%g
 s%@CPPFLAGS@%%g
 s%@CXXFLAGS@%%g
 s%@FFLAGS@%%g