Skip to content

Commit

Permalink
Merge pull request #1 from bcardiff/win
Browse files Browse the repository at this point in the history
fix src to be able to build the compiler (in linux)
  • Loading branch information
lbguilherme authored Dec 31, 2016
2 parents 83cbb5f + 21a7275 commit 6b29c91
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 12 deletions.
7 changes: 3 additions & 4 deletions src/iconv.cr
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{% if !flag?(:windows) %}
require "c/iconv"
{% end %}
require "c/iconv"

# :nodoc:
struct Iconv
Expand All @@ -17,6 +15,8 @@ struct Iconv
end
{% end %}

@iconv = uninitialized LibC::IconvT

{% if !flag?(:windows) %}
@iconv = LibC.iconv_open(to, from)

Expand All @@ -34,7 +34,6 @@ struct Iconv
end
end
{% end %}

end

def self.new(from : String, to : String, invalid : Symbol? = nil)
Expand Down
1 change: 1 addition & 0 deletions src/io.cr
Original file line number Diff line number Diff line change
Expand Up @@ -1029,5 +1029,6 @@ require "./io/error.cr"
require "./io/fd_set.cr"
require "./io/file_descriptor.cr"
require "./io/hexdump.cr"
require "./io/memory.cr"
require "./io/multi_writer.cr"
require "./io/sized.cr"
3 changes: 3 additions & 0 deletions src/lib_c/x86_64-windows-gnu/c/iconv.cr
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
lib LibC
type IconvT = Void*
end
14 changes: 7 additions & 7 deletions src/prelude.cr
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ require "char/reader"
require "class"
require "concurrent"
require "deque"
# require "dir"
require "dir"
require "enum"
require "enumerable"
require "env"
# require "errno"
require "errno"
require "ext"
require "file"
require "float"
require "gc"
# # require "gc/null"
# require "gc/null"
require "gc/boehm"
require "hash"
require "iconv"
Expand All @@ -47,7 +47,7 @@ require "io"
require "kernel"
require "main"
require "math/math"
# require "mutex"
require "mutex"
require "named_tuple"
require "nil"
require "number"
Expand All @@ -61,14 +61,14 @@ require "random"
require "range"
require "reference"
require "reflect"
# require "regex"
require "regex"
require "set"
# require "signal"
require "signal"
require "slice"
require "static_array"
require "struct"
require "symbol"
# require "system"
require "system"
require "thread"
require "time"
require "tuple"
Expand Down
4 changes: 3 additions & 1 deletion src/regex.cr
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
require "./regex/*"
{% if !flag?(:windows) %}
require "./regex/*"
{% end %}

# A Regex represents a regular expression, a pattern that describes the
# contents of strings. A Regex can determine whether or not a string matches
Expand Down
66 changes: 66 additions & 0 deletions windows-prelude.cr
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
require "lib_c"
require "macros"
require "object"
require "comparable"
require "exception"
require "iterable"
require "iterator"
require "indexable"
require "string"

require "array"
require "atomic"
require "bool"
require "box"
require "char"
require "char/reader"
require "class"
require "concurrent"
require "deque"
# require "dir"
require "enum"
require "enumerable"
require "env"
# require "errno"
require "ext"
require "file"
require "float"
require "gc"
# # require "gc/null"
require "gc/boehm"
require "hash"
require "iconv"
require "int"
require "intrinsics"
require "io"
require "kernel"
require "main"
require "math/math"
# require "mutex"
require "named_tuple"
require "nil"
require "number"
require "pointer"
require "pretty_print"
require "primitives"
require "proc"
require "process"
require "raise"
require "random"
require "range"
require "reference"
require "reflect"
# require "regex"
require "set"
# require "signal"
require "slice"
require "static_array"
require "struct"
require "symbol"
# require "system"
require "thread"
require "time"
require "tuple"
require "unicode"
require "union"
require "value"

0 comments on commit 6b29c91

Please sign in to comment.