diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ext/digest/defs.h | 2 | ||||
-rw-r--r-- | ext/digest/sha2/extconf.rb | 16 |
3 files changed, 20 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Wed Aug 15 01:59:19 2001 Akinori MUSHA <knu@iDaemons.org> + + * ext/digest/defs.h: Define NO_UINT64_T instead of emitting an + error to fail. + + * ext/digest/sha2/extconf.rb: Do not exit on error, and utilize + NO_UINT64_T to detect if the system has a 64bit integer type. + Tue Aug 14 21:14:07 2001 Akinori MUSHA <knu@iDaemons.org> * ext/digest/sha2/extconf.rb: do not create Makefile when no 64bit diff --git a/ext/digest/defs.h b/ext/digest/defs.h index 47bf7d030a..7af8f52324 100644 --- a/ext/digest/defs.h +++ b/ext/digest/defs.h @@ -27,7 +27,7 @@ # elif defined(_MSC_VER) typedef unsigned _int64 uint64_t; # else -# error What is a 64bit integer type on this system? +# define NO_UINT64_T # endif #endif diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb index 144f266b20..412b2d4301 100644 --- a/ext/digest/sha2/extconf.rb +++ b/ext/digest/sha2/extconf.rb @@ -17,12 +17,18 @@ have_header("inttypes.h") have_header("unistd.h") -unless try_link(<<SRC, $defs.join(' ')) +if try_run(<<SRC, $defs.join(' ')) #include "../defs.h" -main(){} +int main(void) { +#ifdef NO_UINT64_T + return 1; +#else + return 0; +#endif +} SRC +then + create_makefile("digest/sha2") +else puts "** Cannot find a 64bit integer type - skipping the SHA2 module." - exit 1 end - -create_makefile("digest/sha2") |