From 2875a9a71c1b77c67e4f3eda8f1aae591c13ecf4 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 12 Feb 1999 11:17:06 +0000
Subject: This commit was manufactured by cvs2svn to create tag
 'v1_3_1_990212'.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_3_1_990212@401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/Win32API/Win32API.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'ext/Win32API/Win32API.c')

diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
index f4cb5c726f..86d72769b7 100644
--- a/ext/Win32API/Win32API.c
+++ b/ext/Win32API/Win32API.c
@@ -2,9 +2,11 @@
   Win32API - Ruby Win32 API Import Facility
 */
 
+#ifndef _MSC_VER
 #define  WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdio.h>
+#endif
 
 #define _T_VOID     0
 #define _T_NUMBER   1
@@ -54,35 +56,35 @@ Win32API_initialize(self, dllname, proc, import, export)
     if (!hdll) {
 	hdll = LoadLibrary(RSTRING(dllname)->ptr);
 	if (!hdll)
-	    Fail("LoadLibrary: %s\n", RSTRING(dllname)->ptr);
+	    rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
 	Data_Wrap_Struct(self, 0, Win32API_FreeLibrary, hdll);
     }
     hproc = GetProcAddress(hdll, RSTRING(proc)->ptr);
     if (!hproc) {
-	str = str_new3(proc);
-	str = str_cat(str, "A", 1);
+	str = rb_str_new3(proc);
+	str = rb_str_cat(str, "A", 1);
 	hproc = GetProcAddress(hdll, RSTRING(str)->ptr);
 	if (!hproc)
-	    Fail("GetProcAddress: %s or %s\n",
+	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
 		RSTRING(proc)->ptr, RSTRING(str)->ptr);
     }
     rb_iv_set(self, "__dll__", INT2NUM((int)hdll));
     rb_iv_set(self, "__dllname__", dllname);
     rb_iv_set(self, "__proc__", INT2NUM((int)hproc));
 
-    a_import = ary_new();
+    a_import = rb_ary_new();
     ptr = RARRAY(import)->ptr;
     for (i = 0, len = RARRAY(import)->len; i < len; i++) {
 	int c = *(char *)RSTRING(ptr[i])->ptr;
 	switch (c) {
 	case 'N': case 'n': case 'L': case 'l':
-	    ary_push(a_import, INT2FIX(_T_NUMBER));
+	    rb_ary_push(a_import, INT2FIX(_T_NUMBER));
 	    break;
 	case 'P': case 'p':
-	    ary_push(a_import, INT2FIX(_T_POINTER));
+	    rb_ary_push(a_import, INT2FIX(_T_POINTER));
 	    break;
 	case 'I': case 'i':
-	    ary_push(a_import, INT2FIX(_T_INTEGER));
+	    rb_ary_push(a_import, INT2FIX(_T_INTEGER));
 	    break;
 	}
     }
@@ -146,18 +148,18 @@ Win32API_Call(argc, argv, obj)
     texport = FIX2INT(obj_export);
 
     if (items != nimport)
-	Fail("Wrong number of parameters: expected %d, got %d.\n",
+	rb_raise(rb_eRuntimeError, "Wrong number of parameters: expected %d, got %d.\n",
 	    nimport, items);
 
     if (0 < nimport) {
 	for (i = nimport - 1; 0 <= i; i--) {
 	    VALUE str;
-	    import_type = ary_entry(obj_import, i);
+	    import_type = rb_ary_entry(obj_import, i);
 	    timport = FIX2INT(import_type);
 	    switch (timport) {
 	    case _T_NUMBER:
 	    case _T_INTEGER:
-		lParam = NUM2INT(ary_entry(args, i));
+		lParam = NUM2INT(rb_ary_entry(args, i));
 #if defined(_MSC_VER) || defined(__LCC__)
 		_asm {
 		    mov     eax, lParam
@@ -170,9 +172,9 @@ Win32API_Call(argc, argv, obj)
 #endif
 		break;
 	    case _T_POINTER:
-		str = ary_entry(args, i);
+		str = rb_ary_entry(args, i);
 		Check_Type(str, T_STRING);
-		str_modify(str);
+		rb_str_modify(str);
 		pParam = RSTRING(str)->ptr;
 #if defined(_MSC_VER) || defined(__LCC__)
 		_asm {
@@ -197,7 +199,7 @@ Win32API_Call(argc, argv, obj)
 	break;
     case _T_POINTER:
 	ApiFunctionPointer = (ApiPointer *) ApiFunction;
-	Return = str_new2((char *)ApiFunctionPointer());
+	Return = rb_str_new2((char *)ApiFunctionPointer());
 	break;
     case _T_INTEGER:
 	ApiFunctionInteger = (ApiInteger *) ApiFunction;
@@ -216,7 +218,7 @@ Win32API_Call(argc, argv, obj)
 void
 Init_Win32API()
 {
-    VALUE cWin32API = rb_define_class("Win32API", cObject);
+    VALUE cWin32API = rb_define_class("Win32API", rb_cObject);
     rb_define_method(cWin32API, "initialize", Win32API_initialize, 4);
     rb_define_method(cWin32API, "call", Win32API_Call, -1);
     rb_define_alias(cWin32API,  "Call", "call");
-- 
cgit v1.2.3