diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/digest/sha2/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/digest/sha2/sha2.h | 13 |
3 files changed, 11 insertions, 11 deletions
@@ -1,3 +1,10 @@ +Wed Aug 12 00:04:33 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/digest/sha2/sha2.h: need to include defs.h instead of inttypes.h + because VC6 doesn't have the latter. + + * ext/digest/sha2/extconf.rb: rollback r24441. + Tue Aug 11 21:42:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * numeric.c (num_divmod): fixed rdoc. [ruby-core:24862] diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb index 31c91f2706..c15043f113 100644 --- a/ext/digest/sha2/extconf.rb +++ b/ext/digest/sha2/extconf.rb @@ -13,8 +13,6 @@ $objs = [ have_header("sys/cdefs.h") -have_header("inttypes.h") - $preload = %w[digest] if have_type("uint64_t", "defs.h", $defs.join(' ')) diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h index 87f9674cee..88c5249639 100644 --- a/ext/digest/sha2/sha2.h +++ b/ext/digest/sha2/sha2.h @@ -49,11 +49,8 @@ extern "C" { */ #include <sys/types.h> -#ifdef HAVE_INTTYPES_H -#include <inttypes.h> -#endif - #ifdef RUBY +# include "defs.h" # ifdef HAVE_PROTOTYPES # undef NOPROTO # else @@ -70,11 +67,9 @@ extern "C" { # endif /* BYTE_ORDER */ # define SHA2_USE_INTTYPES_H #else /* RUBY */ -#ifdef SHA2_USE_INTTYPES_H - -#include <inttypes.h> - -#endif /* SHA2_USE_INTTYPES_H */ +# ifdef SHA2_USE_INTTYPES_H +# include <inttypes.h> +# endif /* SHA2_USE_INTTYPES_H */ #endif /* RUBY */ |