Skip to content

Commit

Permalink
Fix some typos for OS X
Browse files Browse the repository at this point in the history
  • Loading branch information
Keno committed Jul 3, 2017
1 parent ea1bdf7 commit 1f3ad87
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/bootstrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1348,7 +1348,7 @@ class JuliaPCHGenerator : public clang::PCHGenerator
return getPCH().size();
}

char *getPCHData(char *data) {
void getPCHData(char *data) {
memcpy(data, getPCH().data(), getPCH().size());
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/initialization.jl
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,13 @@ defineMacro(Name) = defineMacro(__default_compiler__,Name)
nostdcxx = haskey(ENV,"CXXJL_NOSTDCXX")

# On OS X, we just use the libc++ headers that ship with XCode
@static if is_apple() function addStdHeaders(C)
@static if is_apple() function collectStdHeaders!(headers)
xcode_path =
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/"
didfind = false
for path in ("usr/lib/c++/v1/","usr/include/c++/v1")
if isdir(joinpath(xcode_path,path))
addHeaderDir(C,joinpath(xcode_path,path), kind = C_ExternCSystem)
push!(headers, (joinpath(xcode_path,path), C_ExternCSystem))
didfind = true
end
end
Expand Down

0 comments on commit 1f3ad87

Please sign in to comment.