Skip to content

Commit

Permalink
try this
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonDanisch committed Feb 18, 2017
1 parent 36127f5 commit 476d195
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
12 changes: 9 additions & 3 deletions src/IL.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@ typealias ILclampd Cdouble
typealias ILint64 Int64
typealias ILuint64 UInt64

typealias ILchar Cchar
typealias ILstring Ptr{Cchar}
typealias ILconst_string Ptr{Cchar}
if is_windows()
typealias ILchar Cwchar_t
typealias ILstring Cwstring
typealias ILconst_string Cwstring
else
typealias ILchar Cchar
typealias ILstring Cstring
typealias ILconst_string Cstring
end

export ILenum, ILboolean, ILbitfield, ILbyte, ILshort, ILint, ILsizei, ILubyte, ILushort, ILuint, ILfloat, ILclampf, ILdouble, ILclampd, ILint64, ILuint64, ILchar, ILstring, ILconst_string

Expand Down
6 changes: 1 addition & 5 deletions src/fileio.jl
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,7 @@ function newimg()
end

function to_string(str)
path = @static if is_windows()
Cwchar_t.(Vector{UInt8}(str))
else
String(str)
end
String(str)
end

function load_(file::AbstractString; ImageType = Array)
Expand Down

0 comments on commit 476d195

Please sign in to comment.