summaryrefslogtreecommitdiff
path: root/ext/dl
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-05 03:13:18 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-05 03:13:18 +0000
commit20e2c4cb365041c3672760f1ef829d870b7c2601 (patch)
tree9d5758c156c46adde39f3a3edb46c94e840292d9 /ext/dl
parentd56a76a66406ce08d34ebadba7896b50fb0c8950 (diff)
* Use _WIN32 rather than checking for windows.h. Thanks Jon Forums!
[ruby-core:33977] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl')
-rw-r--r--ext/dl/cfunc.c8
-rw-r--r--ext/dl/dl.h2
-rw-r--r--ext/dl/handle.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
index 33ac784..f13ff34 100644
--- a/ext/dl/cfunc.c
+++ b/ext/dl/cfunc.c
@@ -23,7 +23,7 @@ rb_dl_set_last_error(VALUE self, VALUE val)
return Qnil;
}
-#if defined(HAVE_WINDOWS_H)
+#if defined(_WIN32)
#include <windows.h>
static ID id_win32_last_error;
@@ -578,7 +578,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
}
rb_dl_set_last_error(self, INT2NUM(errno));
-#if defined(HAVE_WINDOWS_H)
+#if defined(_WIN32)
rb_dl_set_win32_last_error(self, INT2NUM(GetLastError()));
#endif
@@ -607,13 +607,13 @@ void
Init_dlcfunc(void)
{
id_last_error = rb_intern("__DL2_LAST_ERROR__");
-#if defined(HAVE_WINDOWS_H)
+#if defined(_WIN32)
id_win32_last_error = rb_intern("__DL2_WIN32_LAST_ERROR__");
#endif
rb_cDLCFunc = rb_define_class_under(rb_mDL, "CFunc", rb_cObject);
rb_define_alloc_func(rb_cDLCFunc, rb_dlcfunc_s_allocate);
rb_define_module_function(rb_cDLCFunc, "last_error", rb_dl_get_last_error, 0);
-#if defined(HAVE_WINDOWS_H)
+#if defined(_WIN32)
rb_define_module_function(rb_cDLCFunc, "win32_last_error", rb_dl_get_win32_last_error, 0);
#endif
rb_define_method(rb_cDLCFunc, "initialize", rb_dlcfunc_initialize, -1);
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
index 2fa330f..2b3b1f8 100644
--- a/ext/dl/dl.h
+++ b/ext/dl/dl.h
@@ -20,7 +20,7 @@
#define RTLD_NOW 0
#endif
#else
-# if defined(HAVE_WINDOWS_H)
+# if defined(_WIN32)
# include <windows.h>
# define dlopen(name,flag) ((void*)LoadLibrary(name))
# define dlerror() strerror(rb_w32_map_errno(GetLastError()))
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index ed042e1..6fc771c 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -7,7 +7,7 @@
VALUE rb_cDLHandle;
-#ifdef HAVE_WINDOWS_H
+#ifdef _WIN32
# ifndef _WIN32_WCE
static void *
w32_coredll(void)
@@ -142,7 +142,7 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
rb_secure(2);
-#if defined(HAVE_WINDOWS_H)
+#if defined(_WIN32)
if( !clib ){
HANDLE rb_libruby_handle(void);
ptr = rb_libruby_handle();