Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 8ca84bcce42d0fac9ad5259071c36e1da5da1f68 1 parent 17cc2d6
Mike Nolta nolta authored
2  base/export.jl
@@ -113,7 +113,7 @@ export
113 113 ARGS,
114 114 C_NULL,
115 115 CPU_CORES,
116   - CURRENT_OS,
  116 + OS_NAME,
117 117 ENDIAN_BOM,
118 118 ENV,
119 119 Inf,
4 base/osutils.jl
... ... @@ -1,7 +1,7 @@
1 1 include("os_detect.jl")
2 2
3 3 macro windows_only(ex)
4   - if(CURRENT_OS == :Windows)
  4 + if(OS_NAME == :Windows)
5 5 return esc(ex)
6 6 else
7 7 return :nothing
@@ -9,7 +9,7 @@ macro windows_only(ex)
9 9 end
10 10
11 11 macro unix_only(ex)
12   - if(_jl_is_unix(CURRENT_OS))
  12 + if(_jl_is_unix(OS_NAME))
13 13 return esc(ex)
14 14 else
15 15 return :nothing
2  extras/cairo.jl
@@ -35,7 +35,7 @@ try
35 35 global _jl_libgobject = openlib("libgobject-2.0")
36 36 catch
37 37 println("Oops, could not load cairo or pango libraries. Are they installed?")
38   - if CURRENT_OS == :OSX
  38 + if OS_NAME == :Darwin
39 39 println(E"
40 40 homebrew:
41 41 $ brew install cairo pango
6 src/os_detect.h
@@ -46,7 +46,7 @@ XX(ISUNIX) - OS Traits
46 46 X(0,Windows) XX(0) \
47 47 X(1,Linux) XX(1) \
48 48 X(2,FreeBSD) XX(1) \
49   - X(3,OSX) XX(1)
  49 + X(3,Darwin) XX(1)
50 50 #define JL_OS_MAP(X) JL_OS_MAP2(X,NOP)
51 51 #define OS_INDEX_MAP(x) x
52 52
@@ -57,7 +57,7 @@ XX(ISUNIX) - OS Traits
57 57 #elif defined(__FreeBSD__)
58 58 #define OS_CURRENT FreeBSD
59 59 #elif defined(__APPLE__)
60   - #define OS_CURRENT OSX
  60 + #define OS_CURRENT Darwin
61 61 #else
62 62 #define OS_CURRENT Unknown
63 63 #endif
@@ -66,7 +66,7 @@ XX(ISUNIX) - OS Traits
66 66 /** REMOVED - SEE ABOVE COMMENT */
67 67 #else
68 68
69   -const CURRENT_OS = :OS_CURRENT
  69 +const OS_NAME = :OS_CURRENT
70 70
71 71 #define OS_NAME_IFELSE(NUM,NAME) JL_IF(JL_BOOL(NUM),elseif,if) (os==:NAME) return
72 72 #define ATTR(IS_UNIX) JL_TF(JL_BOOL(IS_UNIX)); \n

0 comments on commit 8ca84bc

Please sign in to comment.
Something went wrong with that request. Please try again.