From b237a1c2eacc5e01f9e50c423ced8b9f4e5cb768 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 31 Mar 2018 15:33:15 +0200 Subject: Use int instead of bool Causes issues when including in some files. --- intern/clog/CLG_log.h | 2 +- intern/clog/clog.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h index a6c66114a5f..8afa9edd75b 100644 --- a/intern/clog/CLG_log.h +++ b/intern/clog/CLG_log.h @@ -144,7 +144,7 @@ void CLG_init(void); void CLG_exit(void); void CLG_output_set(void *file_handle); -void CLG_output_use_basename_set(bool value); +void CLG_output_use_basename_set(int value); void CLG_fatal_fn_set(void (*fatal_fn)(void *file_handle)); void CLG_type_filter_include(const char *type_filter, int type_filter_len); diff --git a/intern/clog/clog.c b/intern/clog/clog.c index 37dadb69fca..93822f9031d 100644 --- a/intern/clog/clog.c +++ b/intern/clog/clog.c @@ -456,9 +456,9 @@ static void CLG_ctx_output_set(CLogContext *ctx, void *file_handle) #endif } -static void CLG_ctx_output_use_basename_set(CLogContext *ctx, bool value) +static void CLG_ctx_output_use_basename_set(CLogContext *ctx, int value) { - ctx->use_basename = value; + ctx->use_basename = (bool)value; } /** Action on fatal severity. */ @@ -545,7 +545,7 @@ void CLG_output_set(void *file_handle) CLG_ctx_output_set(g_ctx, file_handle); } -void CLG_output_use_basename_set(bool value) +void CLG_output_use_basename_set(int value) { CLG_ctx_output_use_basename_set(g_ctx, value); } -- cgit v1.2.3