Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

rename CURRENT_OS -> OS_NAME, and :OSX -> :Darwin

  • Loading branch information...
commit 8ca84bcce42d0fac9ad5259071c36e1da5da1f68 1 parent 17cc2d6
@nolta nolta authored
View
2  base/export.jl
@@ -113,7 +113,7 @@ export
ARGS,
C_NULL,
CPU_CORES,
- CURRENT_OS,
+ OS_NAME,
ENDIAN_BOM,
ENV,
Inf,
View
4 base/osutils.jl
@@ -1,7 +1,7 @@
include("os_detect.jl")
macro windows_only(ex)
- if(CURRENT_OS == :Windows)
+ if(OS_NAME == :Windows)
return esc(ex)
else
return :nothing
@@ -9,7 +9,7 @@ macro windows_only(ex)
end
macro unix_only(ex)
- if(_jl_is_unix(CURRENT_OS))
+ if(_jl_is_unix(OS_NAME))
return esc(ex)
else
return :nothing
View
2  extras/cairo.jl
@@ -35,7 +35,7 @@ try
global _jl_libgobject = openlib("libgobject-2.0")
catch
println("Oops, could not load cairo or pango libraries. Are they installed?")
- if CURRENT_OS == :OSX
+ if OS_NAME == :Darwin
println(E"
homebrew:
$ brew install cairo pango
View
6 src/os_detect.h
@@ -46,7 +46,7 @@ XX(ISUNIX) - OS Traits
X(0,Windows) XX(0) \
X(1,Linux) XX(1) \
X(2,FreeBSD) XX(1) \
- X(3,OSX) XX(1)
+ X(3,Darwin) XX(1)
#define JL_OS_MAP(X) JL_OS_MAP2(X,NOP)
#define OS_INDEX_MAP(x) x
@@ -57,7 +57,7 @@ XX(ISUNIX) - OS Traits
#elif defined(__FreeBSD__)
#define OS_CURRENT FreeBSD
#elif defined(__APPLE__)
- #define OS_CURRENT OSX
+ #define OS_CURRENT Darwin
#else
#define OS_CURRENT Unknown
#endif
@@ -66,7 +66,7 @@ XX(ISUNIX) - OS Traits
/** REMOVED - SEE ABOVE COMMENT */
#else
-const CURRENT_OS = :OS_CURRENT
+const OS_NAME = :OS_CURRENT
#define OS_NAME_IFELSE(NUM,NAME) JL_IF(JL_BOOL(NUM),elseif,if) (os==:NAME) return
#define ATTR(IS_UNIX) JL_TF(JL_BOOL(IS_UNIX)); \n
Please sign in to comment.
Something went wrong with that request. Please try again.