Skip to content

Commit

Permalink
Fix @windowsxp_only macro
Browse files Browse the repository at this point in the history
the previous version of this macro was hard-coding the result of
windows_version() from the build machine, and the buildbots are
all newer than XP so this was not working correctly
  • Loading branch information
tkelman committed Apr 27, 2015
1 parent 982c60a commit 8e68fe2
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions base/osutils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,10 @@ end

WINDOWS_XP_VER = (5,1)

macro windowsxp(qm,ex)
_os_test(qm, ex, OS_NAME===:Windows && windows_version() <= WINDOWS_XP_VER)
end

macro windowsxp_only(ex)
@windowsxp? esc(ex) : nothing
_os_test(:?, Expr(:(:), ex, nothing), OS_NAME===:Windows && windows_version() <= WINDOWS_XP_VER)
end

macro non_windowsxp_only(ex)
@windowsxp? nothing : esc(ex)
_os_test(:?, Expr(:(:), nothing, ex), OS_NAME===:Windows && windows_version() <= WINDOWS_XP_VER)
end

0 comments on commit 8e68fe2

Please sign in to comment.