diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 08:39:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 08:39:56 +0300 |
| commit | c1730a03af3c929d256ddda04cc2657fc9a03dc0 (patch) | |
| tree | 9dc2be00478049f54d92c46125fa29ce086514b8 /intern | |
| parent | 55939bf21936c6bef5c350fbf679c08a7c57ea88 (diff) | |
| parent | b4e8d33f1184837705255a19a5e513aa4aad96ab (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/clog/clog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/clog/clog.c b/intern/clog/clog.c index 812915e6f95..dc0229e0748 100644 --- a/intern/clog/clog.c +++ b/intern/clog/clog.c @@ -29,7 +29,7 @@ #include <assert.h> /* For 'isatty' to check for color. */ -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) # include <unistd.h> #endif @@ -454,7 +454,7 @@ static void CLG_ctx_output_set(CLogContext *ctx, void *file_handle) { ctx->output_file = file_handle; ctx->output = fileno(file_handle); -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) ctx->use_color = isatty(ctx->output); #endif } |