ruby-dev

成瀬です。

U.Nakamura wrote:
> In message "[ruby-dev:34032] Re: uint32_t"
>     on Mar.13,2008 17:30:41, <naruse@airemix.com> wrote:
> | この時点では uint32_t でなく unsigned int なので実際に uint32_t になるのは r15760 ですね。
> | なにはともあれ r15762 でビルドは通るようになっていると思います。
> 
> ext/digest/defs.hでuint32_tをtypedefしようとしているせいで、
> inttypes.hがない環境ではビルドが通らないようになってますが :)
> 
> これどうしましょうかね。
> uint8_tとuint64_t(可能なら)もrubyで用意するようにしてこの辺ま
> るごと消すのがいいんですかね。

とりあえずこんな感じでどうでしょう。


-- 
NARUSE, Yui  <naruse@airemix.com>
DBDB A476 FDBD 9450 02CD 0EFC BCE3 C388 472E C1EA

Attachments (1)

int.patch (3.49 KB, text/x-diff)

--- configure.in	(revision 15770)
+++ configure.in	(working copy)
@@ -620,18 +620,39 @@ AC_CHECK_TYPES(struct timespec)
 
 AC_CHECK_TYPE(fd_mask, [AC_DEFINE(HAVE_RB_FD_INIT, 1)])
 
-test ${rb_cv_type_uint32_t+set} && ac_cv_type_uint32_t=yes
-AC_CHECK_TYPE(uint32_t)
-if test ${ac_cv_type_uint32_t} != yes; then
-    AC_CACHE_CHECK([unsigned 32bit int],
-	rb_cv_type_uint32_t,
-	[for type in short int long; do
-	    type="unsigned $type"
-	    AC_COMPILE_IFELSE(AC_LANG_BOOL_COMPILE_TRY([], [sizeof($type) == 4]),
-		[rb_cv_type_uint32_t=$type; break], [])
-	done])
-    AC_DEFINE_UNQUOTED(uint32_t, $rb_cv_type_uint32_t)
+dnl RUBY_DEFINT [typename] [size] [signed]
+AC_DEFUN([RUBY_DEFINT], [dnl
+AC_CACHE_CHECK([for $1], [rb_cv_type_$1],
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])
+typedef $1 t; int s = sizeof(t) == 42;])],
+   [rb_cv_type_$1=yes],
+   [case m4_bmatch([$2], [^[1-9][0-9]*$], $2, [$ac_cv_sizeof_]AS_TR_SH($2)) in
+    "1") rb_cv_type_$1="m4_if([$3], [], [signed ], [$3 ])char";;
+    "$ac_cv_sizeof_short") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])short";;
+    "$ac_cv_sizeof_int") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])int";;
+    "$ac_cv_sizeof_long") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long";;
+    "$ac_cv_sizeof_long_long") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long long";;
+    "$ac_cv_sizeof___int64") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64";;
+    *) rb_cv_type_$1=no;;
+    esac])])
+if test "${rb_cv_type_$1}" != no; then
+    AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)
+    test "${rb_cv_type_$1}" = yes || AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1])
 fi
+])
+
+RUBY_DEFINT(int8_t, 1)
+RUBY_DEFINT(uint8_t, 1, unsigned)
+RUBY_DEFINT(int16_t, 2)
+RUBY_DEFINT(uint16_t, 2, unsigned)
+RUBY_DEFINT(int32_t, 4)
+RUBY_DEFINT(uint32_t, 4, unsigned)
+RUBY_DEFINT(int64_t, 8)
+RUBY_DEFINT(uint64_t, 8, unsigned)
+RUBY_DEFINT(int128_t, 16)
+RUBY_DEFINT(uint128_t, 16, unsigned)
+RUBY_DEFINT(intptr_t, void*)
+RUBY_DEFINT(uintptr_t, void*, unsigned)
 
 AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
 [rb_cv_stack_end_address=no
--- ext/digest/defs.h	(revision 15770)
+++ ext/digest/defs.h	(working copy)
@@ -16,18 +16,4 @@
 # define __END_DECLS
 #endif
 
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif !defined __CYGWIN__ || !defined __uint8_t_defined
-  typedef unsigned char uint8_t;
-  typedef unsigned int  uint32_t;
-# if SIZEOF_LONG == 8
-  typedef unsigned long uint64_t;
-# elif SIZEOF_LONG_LONG == 8
-  typedef unsigned LONG_LONG uint64_t;
-# else
-#  define NO_UINT64_T
-# endif
-#endif
-
 #endif /* DEFS_H */
--- win32/Makefile.sub	(revision 15770)
+++ win32/Makefile.sub	(working copy)
@@ -368,6 +368,31 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/
 #define uint32_t unsigned int
 #define HAVE_STRUCT_STAT_ST_RDEV 1
 #define HAVE_ST_RDEV 1
+#define int8_t signed char
+#define HAVE_UINT8_T 1
+#define uint8_t unsigned char
+#define HAVE_INT16_T 1
+#define int16_t short
+#define HAVE_UINT16_T 1
+#define uint16_t unsigned short
+#define HAVE_INT32_T 1
+#define int32_t int
+#define HAVE_UINT32_T 1
+#define uint32_t unsigned int
+#define HAVE_INT64_T HAVE_LONG_LONG
+#define int64_t __int64
+#define HAVE_UINT64_T HAVE_LONG_LONG
+#define uint64_t unsigned __int64
+#define HAVE_INTPTR_T 1
+#define HAVE_UINTPTR_T 1
+!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"
+#define intptr_t __int64
+#define uintptr_t unsigned __int64
+!else
+#define intptr_t long
+#define uintptr_t unsigned long
+!endif
+#endif
 #define GETGROUPS_T int
 #define RETSIGTYPE void
 !if !defined(WIN32_WCE)

Thread

Prev Next

In This Thread

Prev Next

[#33946] Symbol#inspect should use rb_str_inspect — sheepman <sheepman@...>

[#33947] Ruby 1.9.0-1 snapshot released — Yukihiro Matsumoto <matz@...>

[#33948] Schedule for the 1.8.7 release — "Akinori MUSHA" <knu@...>

[#33950] Ruby 1.9.0-1 build failure: error: `r15660' undeclared — "Hiroshi Ichikawa" <gimite@...>

[#33952] Float('1__1') — Tadayoshi Funaba <tadf@...>

[#33954] Mac OS X 10.5.2でruby-1.9.0-1のmake testが失敗 — 高尾 宏治 <kouji@...>

[#33955] --encoding affects script encoding — sheepman <sheepman@...>

[#33962] Ruby1.9.0でのインタプリタ組み込みについての質問 — Masayuki Yamaguchi <Yamaguchi.Masayuki@...>

[#33966] Re: [ruby-cvs:22881] Ruby:r15644 (trunk): * test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_chomp): test — Tanaka Akira <akr@...>

[#33967] $SAFE=1でLoadErrorではなくInsecure operationになる — "Ken Date" <itacchi@...>

[#33972] なぜ transcode.c の transcode_loop で from_utf8 が特別扱い — Martin Duerst <duerst@...>

[#33974] Test::Unit::Collector::Dirがtest_*.rb以外集めてくれない — "Ken Date" <itacchi@...>

[#33983] Re: [ruby-cvs:22913] Re: Ruby:r15674 (trunk): * gc.c (add_heap): sort heaps array in ascending order to use — Yukihiro Matsumoto <matz@...>

[#33989] Hash#compare_by_identity breaks commutativity of Hash#== — Tanaka Akira <akr@...>

[#33991] Maybe IRB bug!! by 09 — Tanaka Akira <akr@...>

[#33992] debug.rb:221:in `debug_command': undefined method `callcc' for #<DEBUGGER__::Context:0xb7a85914> (NoMethodError) — Tanaka Akira <akr@...>

[#33993] Re: [ruby-cvs:22935] Ruby:r15695 (trunk): * string.c (is_utf8_lead_byte, count_utf8_lead_bytes_with_ulong): — Tanaka Akira <akr@...>

[#33994] printf "[%08f]\n", 0.0/0.0 — Tanaka Akira <akr@...>

[#33996] No definition for sym_succ など — Martin Duerst <duerst@...>

[#34000] --program-suffix option of configure.bat(mswin32) — KIMURA Koichi <kimura.koichi@...>

[#34002] sprintf("% e", Inf) — Tanaka Akira <akr@...>

[#34005] Array#slice! may be too slow and allocate memory too much — "Yusuke ENDOH" <mame@...>

[#34006] 11.divmod(3.5) — Tanaka Akira <akr@...>

[#34008] local_variables contains strings — Tanaka Akira <akr@...>

[#34010] RUBY_*定数のencoding — Kazuhiro NISHIYAMA <zn@...>

[#34011] Should --verbose be equal to -v ? — Yugui <yugui@...>

[#34019] DelegateClassのバックトレース — "GO Noguchi" <gonoguti@...>

[#34020] MurmurHash problem — Nobuyoshi Nakada <nobu@...>

[#34021] singleton class extended by a module with module_function — Tanaka Akira <akr@...>

[#34022] patch of lazy sweep gc — authorNari <authornari@...>

[#34030] uint32_t — KIMURA Koichi <kimura.koichi@...>

[#34033] ruby coding guideline — "NARUSE, Yui" <naruse@...>

[#34037] Ruby performance gains on SPARC — Yukihiro Matsumoto <matz@...>

[#34042] IOはこれからもEnumerableなのか — rubikitch@...

[#34048] CGI::Cookie.new を高速化するバッチ — "Makoto Kuwata" <kwa@...>

[#34052] IO should provide #each_char and #chars — Yugui <yugui@...>

[#34059] putsでSEGV — rubikitch@...

[#34066] Bignum#div — Tadayoshi Funaba <tadf@...>

[#34067] Array#take,take_while,drop,drop_whlie — "Yusuke ENDOH" <mame@...>

[#34068] lgamma_r requires _REENTRANT on Solaris — "Yusuke ENDOH" <mame@...>

[#34071] procを組み合わせた再帰呼び出しで例外が投げられない — wanabe <s.wanabe@...>

[#34072] rb_memsearch optimization — "NARUSE, Yui" <naruse@...>

[#34077] 異なるエンコーディングだと同じバイト列でも==にならない件 — rubikitch@...

[#34086] extend spawn to change attributes of child process. — Tanaka Akira <akr@...>

[#34093] 拡張ライブラリ初期化中でのmodule_eval — Kouhei Sutou <kou@...>

[#34094] tempfile.unlink 後に tempfile.close — SATOH Fumiyasu <fumiyas@...>

[#34095] (再送) Cygwin で Resolv.getaddress が失敗する — Kouhei Yanagita <yanagi@...>

[#34100] delegate Kernel#{gets,readline,readlines} to ARGF — Nobuyoshi Nakada <nobu@...>

[#34105] rational.rb, complex.rb and mathn.rb — Tadayoshi Funaba <tadf@...>

[#34109] LP64: date.rb:321:in `convert': integer 86400000000000 too big to convert to `int' (RangeError) — Tanaka Akira <akr@...>

[#34112] Module#define_methodがprivateなわけ — rubikitch@...

[#34114] Is 'Class.new(Class)' valid? — rucila <rucila@...>

[#34116] Improving Fixnum#gcd(Fixnum) — "Akinori MUSHA" <knu@...>

[#34117] backporting features from 1.9 to 1.8 — "Akinori MUSHA" <knu@...>

[#34119] Process.daemon kills other threads — Tanaka Akira <akr@...>

[#34122] --disable=all --enable=gems — Kazuhiro NISHIYAMA <zn@...>

[#34128] enumerator with certain built-in methods dumps core — "Yusuke ENDOH" <mame@...>

[#34136] thread.c (fastthread)の状況 — Daigo Moriwaki <techml@...>

[#34144] [質問２点] C からの定数参照 & thread switching コストの低減 — Hidetoshi NAGAI <nagai@...>

[#34150] sigsetjmp significantly slower on OSX. — Yukihiro Matsumoto <matz@...>

[#34158] Complex組み込み — Masahiro TANAKA <masa16.tanaka@...>

[#34159] ruby-trunk Marshal.dump bug — nagachika <rucila@...>

[#34162] GC heap size less patch — authorNari <authornari@...>

[#34163] Array#shift/unshift の高速化 — wanabe <s.wanabe@...>

[#34180] メソッドにクラスを定義させるとprivateになる？ — rubikitch@...

[#34184] Re: [ruby-cvs:23097] Ruby:r15858 (trunk): * io.c: IO.copy_stream implemented. — "U.Nakamura" <usa@...>

[#34189] Re: [ruby-cvs:23106] Re: Ruby:r15866 (trunk): * numeric.c (num_quo): should convert its operand to Rational. — Tadayoshi Funaba <tadf@...>

[#34191] Object#singleton_class — rubikitch@...

[ruby-dev:34040] Re: uint32_t

Attachments (1)

Thread

In This Thread

[#33954] Mac OS X 10.5.2でruby-1.9.0-1のmake testが失敗 — 高尾宏治 <kouji@...>

[#34072] rb_memsearch　optimization — "NARUSE, Yui" <naruse@...>