summaryrefslogtreecommitdiff
path: root/ext
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
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')
-rw-r--r--ext/dl/cfunc.c8
-rw-r--r--ext/dl/dl.h2
-rw-r--r--ext/dl/handle.c4
-rw-r--r--ext/fiddle/extconf.rb1
-rw-r--r--ext/fiddle/fiddle.c2
-rw-r--r--ext/fiddle/fiddle.h2
-rw-r--r--ext/fiddle/function.c2
7 files changed, 10 insertions, 11 deletions
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
index 33ac78490f1..f13ff3405f6 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 2fa330f925f..2b3b1f827e7 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 ed042e12c7e..6fc771ceb90 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();
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 3dcd914ddfd..03b0ac27656 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -18,7 +18,6 @@ unless have_library('ffi') || have_library('libffi')
end
have_header 'sys/mman.h'
-have_header 'windows.h'
create_makefile 'fiddle'
diff --git a/ext/fiddle/fiddle.c b/ext/fiddle/fiddle.c
index 78e21c57cfb..2580ac0e532 100644
--- a/ext/fiddle/fiddle.c
+++ b/ext/fiddle/fiddle.c
@@ -18,7 +18,7 @@ void Init_fiddle()
rb_define_const(mFiddle, "TYPE_FLOAT", INT2NUM(TYPE_FLOAT));
rb_define_const(mFiddle, "TYPE_DOUBLE", INT2NUM(TYPE_DOUBLE));
-#if defined(HAVE_WINDOWS_H)
+#if defined(_WIN32)
rb_define_const(mFiddle, "WINDOWS", Qtrue);
#else
rb_define_const(mFiddle, "WINDOWS", Qfalse);
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
index 4418fafb1e1..7165969225f 100644
--- a/ext/fiddle/fiddle.h
+++ b/ext/fiddle/fiddle.h
@@ -4,7 +4,7 @@
#include <ruby.h>
#include <errno.h>
-#if defined(HAVE_WINDOWS_H)
+#if defined(_WIN32)
#include <windows.h>
#endif
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index ff18595c13d..911c9b80fc5 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -125,7 +125,7 @@ function_call(int argc, VALUE argv[], VALUE self)
ffi_call(cif, NUM2PTR(rb_Integer(cfunc)), &retval, values);
rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno));
-#if defined(HAVE_WINDOWS_H)
+#if defined(_WIN32)
rb_funcall(mFiddle, rb_intern("win32_last_error="), 1, INT2NUM(errno));
#endif