From 5713c5953180f8a89536e855ea3620dd93f4cd82 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 8 Jun 2013 05:17:04 +0000 Subject: win32.c: NET_LUID * configure.in: check for NET_LUID. header macro varies across complier versions. * win32/win32.c: use configured macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 168 ++-------------------------------------------------------- configure.in | 6 +++ win32/win32.c | 2 +- 3 files changed, 11 insertions(+), 165 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05a148d188..47e0d9ed94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,169 +1,9 @@ -Sat Jun 8 11:59:55 2013 Tanaka Akira +Sat Jun 8 14:17:01 2013 Nobuyoshi Nakada - * random.c (int_pair_to_real_inclusive): Use rb_funcall instead of - rb_big_mul because rb_integer_unpack can return a Fixnum. + * configure.in: check for NET_LUID. header macro varies across + complier versions. -Sat Jun 8 11:17:39 2013 Tanaka Akira - - * random.c (int_pair_to_real_inclusive): Use rb_integer_pack. - -Sat Jun 8 09:49:42 2013 Tanaka Akira - - * random.c (int_pair_to_real_inclusive): Use rb_integer_unpack. - -Sat Jun 8 08:12:22 2013 Tanaka Akira - - * random.c (random_load): Use rb_integer_pack. - -Sat Jun 8 06:15:46 2013 Tanaka Akira - - * random.c (numberof): Removed. - -Sat Jun 8 06:00:47 2013 Tanaka Akira - - * random.c: include internal.h. - (mt_state): Use rb_integer_unpack. - -Sat Jun 8 00:55:51 2013 Tanaka Akira - - * bignum.c (integer_pack_loop_setup): word_num_nailbytes_ret argument - removed. - (rb_integer_pack): Follow the above change. - (rb_integer_unpack): Follow the above change. - -Sat Jun 8 00:37:32 2013 Tanaka Akira - - * bignum.c (validate_integer_pack_format): Renamed from - validate_integer_format. - (integer_pack_loop_setup): Renamed from integer_format_loop_setup. - (integer_pack_fill_dd): Renamed from int_export_fill_dd. - (integer_pack_take_lowbits): Renamed from int_export_take_lowbits. - (integer_unpack_push_bits): Renamed from int_import_push_bits. - -Fri Jun 7 23:58:06 2013 Tanaka Akira - - * bignum.c (rb_integer_pack): Arguments changed. Use flags to - specify word order and byte order. - (rb_integer_unpack): Ditto. - (validate_integer_format): Follow the above change. - (integer_format_loop_setup): Ditto. - - * pack.c: Ditto. - - * internal.h: Ditto. - (INTEGER_PACK_MSWORD_FIRST): Defined. - (INTEGER_PACK_LSWORD_FIRST): Ditto. - (INTEGER_PACK_MSBYTE_FIRST): Ditto. - (INTEGER_PACK_LSBYTE_FIRST): Ditto. - (INTEGER_PACK_NATIVE_BYTE_ORDER): Ditto. - (INTEGER_PACK_LITTLE_ENDIAN): Ditto. - (INTEGER_PACK_BIG_ENDIAN): Ditto. - -Fri Jun 7 22:10:50 2013 NARUSE, Yui - - * lib/rubygems/specification.rb (Gem::Specification#to_yaml): - use Gem::NoAliasYAMLTree.create instead of Gem::NoAliasYAMLTree.new - to suppress deprecated warnings. - -Fri Jun 7 21:39:39 2013 Tanaka Akira - - * bignum.c (rb_integer_pack): Renamed from rb_int_export. - (rb_integer_unpack): Renamed from rb_int_import. - - * internal.h, pack.c: Follow the above change. - -Fri Jun 7 21:05:26 2013 Tanaka Akira - - * bignum.c (integer_format_loop_setup): Extracted from rb_int_export - and rb_int_import. - -Fri Jun 7 19:48:38 2013 Tanaka Akira - - * bignum.c (validate_integer_format): Extracted from rb_int_export and - rb_int_import. - -Fri Jun 7 19:23:15 2013 Tanaka Akira - - * bignum.c (rb_absint_size): Use numberof. - (rb_int_export): Ditto. - -Fri Jun 7 18:58:56 2013 Tanaka Akira - - * internal.h (numberof): Gathered from various files. - - * array.c, math.c, thread_pthread.c, iseq.c, enum.c, string.c, io.c, - load.c, compile.c, struct.c, eval.c, gc.c, parse.y, process.c, - error.c, ruby.c: Remove the definitions of numberof. - -Fri Jun 7 18:24:39 2013 Tanaka Akira - - * bignum.c (rb_absint_size): Declare a variable, i, just before used - to suppress a warning. - (rb_int_export): Ditto. - -Fri Jun 7 17:41:00 2013 Charlie Somerville - - * bignum.c (rb_absint_size): explicit cast to BDIGIT to avoid implicit - 64 bit to 32 bit shortening warning - * bignum.c (rb_int_export): ditto - * bignum.c (int_import_push_bits): ditto - -Fri Jun 7 17:31:00 2013 Charlie Somerville - - * internal.h (RCLASS_SUPER): use descriptive variable name - * internal.h (RCLASS_SET_SUPER): ditto - -Fri Jun 7 13:25:27 2013 NARUSE, Yui - - * ext/json/fbuffer/fbuffer.h (fbuffer_append_str): change the place of - RB_GC_GUARD. it should be after the object is used. - -Fri Jun 7 13:22:43 2013 NARUSE, Yui - - * gc.c (before_gc_sweep): noinline can also avoid the segv instead of - -O0 of r41084. this way is expected less slow. - -Fri Jun 7 11:45:42 2013 Kenta Murata - - * rational.c (numeric_quo): move num_quo in numeric.c to numeric_quo - in rational.c to refer canonicalization state for mathn support. - [ruby-core:41575] [Bug #5736] - - * numeric.c (num_quo): ditto. - - * test/test_mathn.rb: add a test for the change at r41109. - -Fri Jun 7 11:41:42 2013 Nobuyoshi Nakada - - * configure.in: revert r41106. size_t may not be unsigned - - * bignum.c (rb_absint_size_in_word, rb_int_export, rb_int_import): use - NUM2SIZET() and SIZET2NUM() already defined in ruby/ruby.h. - -Fri Jun 7 11:28:37 2013 Masaya Tarui - - * gc.c: use oldgen bitmap as initial mark bitmap when major gc. - so can skip oldgen bitmap check around mark & sweep. - * gc.c (slot_sweep_body): change scan algorithm for performance: - from object's pointer base to bitmap one. - -Fri Jun 7 11:25:56 2013 Masaya Tarui - - * gc.c: introduce oldgen bitmap for preparing performance tuning. - -Fri Jun 7 11:20:57 2013 Masaya Tarui - - * gc.c (MARKED_IN_BITMAP, MARK_IN_BITMAP, CLEAR_IN_BITMAP): bring - bitmap macros in one place, and introduce BITMAP_BIT. - -Fri Jun 7 11:18:35 2013 Masaya Tarui - - * array.c (ary_new): change order of allocation in order - to remove FL_OLDGEN operation. - -Fri Jun 7 11:16:28 2013 Masaya Tarui - - * tool/rdocbench.rb: add gc total time information. + * win32/win32.c: use configured macro. Fri Jun 7 10:12:01 2013 Koichi Sasada diff --git a/configure.in b/configure.in index ff796bef5a..2aea00a169 100644 --- a/configure.in +++ b/configure.in @@ -953,6 +953,12 @@ main() ac_cv_func_gmtime_r=yes rb_cv_large_fd_select=yes ac_cv_type_struct_timeval=yes + AC_CHECK_TYPE([NET_LUID], [], [], + [@%:@include + @%:@include ]) + if test x"$ac_cv_type_NET_LUID" = xyes; then + AC_DEFINE(HAVE_TYPE_NET_LUID, 1) + fi AC_LIBOBJ([langinfo]) ], [os2-emx*], [ LIBS="-lm $LIBS" diff --git a/win32/win32.c b/win32/win32.c index 25d94ff429..7b42df096f 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3763,7 +3763,7 @@ str2guid(const char *str, GUID *guid) } /* License: Ruby's */ -#if !defined(_IFDEF_) && !defined(__MINGW64__) +#ifndef HAVE_TYPE_NET_LUID typedef struct { uint64_t Value; struct { -- cgit v1.2.3