From: Aaron Patterson Date: 2010-12-29T05:00:41+09:00 Subject: [ruby-core:33968] Re: [Ruby 1.9-Bug#4214] Fiddle::WINDOWS == false on Windows --pWyiEgJYm5f9v55/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 29, 2010 at 12:03:48AM +0900, Luis Lavena wrote: > Issue #4214 has been updated by Luis Lavena. >=20 >=20 > Nobu, something like this could work for you? >=20 >=20 > diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb > index 3dcd914..03b0ac2 100644 > --- a/ext/fiddle/extconf.rb > +++ b/ext/fiddle/extconf.rb > @@ -18,7 +18,6 @@ unless have_library('ffi') || have_library('libffi') > end > =20 > have_header 'sys/mman.h' > -have_header 'windows.h' > =20 > create_makefile 'fiddle' > =20 > diff --git a/ext/fiddle/fiddle.c b/ext/fiddle/fiddle.c > index 78e21c5..2580ac0 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)); > =20 > -#if defined(HAVE_WINDOWS_H) > +#if defined(_WIN32) > rb_define_const(mFiddle, "WINDOWS", Qtrue); > #else > rb_define_const(mFiddle, "WINDOWS", Qfalse); >=20 > =3D=3D=3D >=20 > There is no windows.h check and we rely on _WIN32 that is defined either = if you're on 32 or 64 bits. > (above patch is against trunk codebase) I prefer this solution. If you windows guys say it's good, then I think we should apply. :-D --=20 Aaron Patterson http://tenderlovemaking.com/ --pWyiEgJYm5f9v55/ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) iQEcBAEBAgAGBQJNGkHiAAoJEJUxcLy0/6/GFSYH/2Vfrj/5Kt96XL6yHt54YmO/ qA/nSpIMIJa8p23YTdm6mBZpwFQ0gfxhmqkXuB4Jh3jx+DXvLwZenceDeiTa78am 9q98knlCbIW/etE+2lEewl6/V3c4vxx6h384b7rSKLsXWcv9avHsSQUX3965LJWC AOFIUdapsr9ppkOQe3hLHJHHksNbHRMK/L0GqfxC7ti8CkHaslv6Yg8RGvSXtEZx NAlvD1Cr35eJzaM+6IMAkmjaoZWr3QpuAUdqZm9Sne6Yb670kPGNtIK/e+8uuYjz 0/Kte8uiSZg8M7VOq+ZuNI035ZnSNVG//cKGTMp+ttlm+oEk0njZg+DGkuyINEM= =qTJ6 -----END PGP SIGNATURE----- --pWyiEgJYm5f9v55/--