File tree Expand file tree Collapse file tree 6 files changed +20
-4
lines changed
Expand file tree Collapse file tree 6 files changed +20
-4
lines changed Original file line number Diff line number Diff line change 1+ 3.0.1
2+ -----
3+
4+ Fixed:
5+
6+ * Windows support was broken in 3.0.0
7+
8+
193.0.0
210-----
311
Original file line number Diff line number Diff line change @@ -29,6 +29,8 @@ namespace "ffi-compiler" do
2929 t . cflags << "-D_GNU_SOURCE=1" if RbConfig ::CONFIG [ "host_os" ] . downcase =~ /mingw/
3030 t . cflags << "-arch x86_64 -arch i386" if t . platform . mac?
3131 t . ldflags << "-arch x86_64 -arch i386" if t . platform . mac?
32+
33+ t . add_define 'WINDOWS_OS' if FFI ::Platform . windows?
3234 end
3335end
3436task :compile_ffi => [ "ffi-compiler:default" ]
Original file line number Diff line number Diff line change @@ -7,4 +7,6 @@ FFI::Compiler::CompileTask.new('scrypt_ext') do |t|
77 t . cflags << "-arch x86_64 -arch i386" if t . platform . mac?
88 t . ldflags << "-arch x86_64 -arch i386" if t . platform . mac?
99 t . export '../../lib/scrypt/scrypt_ext.rb'
10+
11+ t . add_define 'WINDOWS_OS' if FFI ::Platform . windows?
1012end
Original file line number Diff line number Diff line change 2929/* #include "bsdtar_platform.h" */
3030
3131#include <sys/types.h>
32- #include <sys/mman.h>
33-
32+ #if !defined(WINDOWS_OS )
33+ #include <sys/mman.h>
34+ #ifndef HAVE_MMAP
35+ #define HAVE_MMAP 1
36+ #endif
37+ #endif
3438#include <errno.h>
3539#include <stdint.h>
3640#include <stdlib.h>
Original file line number Diff line number Diff line change 11module SCrypt
2- VERSION = "3.0.0 "
2+ VERSION = "3.0.1 "
33end
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ Gem::Specification.new do |s|
1919 alternative functions such as PBKDF2 or bcrypt.
2020 EOF
2121
22- s . add_dependency 'ffi-compiler' , '>= 0 .0.2 '
22+ s . add_dependency 'ffi-compiler' , '>= 1 .0.0 '
2323 s . add_dependency 'rake'
2424 s . add_development_dependency "rspec"
2525 s . add_development_dependency "rdoc"
You can’t perform that action at this time.
0 commit comments