From 50a96959f0d91b40e3925e5b4c7b735bce613a19 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Wed, 28 Mar 2018 21:34:08 +0100 Subject: [PATCH] libtt: Resolve some compiler warnings --- cde/lib/tt/lib/api/c/api_storage.C | 5 +++-- cde/lib/tt/lib/tt_options.h | 1 + cde/lib/tt/mini_isam/iscntl.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cde/lib/tt/lib/api/c/api_storage.C b/cde/lib/tt/lib/api/c/api_storage.C index 45d53e8b..688585dd 100644 --- a/cde/lib/tt/lib/api/c/api_storage.C +++ b/cde/lib/tt/lib/api/c/api_storage.C @@ -42,6 +42,7 @@ * be growing the array when out of room. */ +#include #include #include #include "api/c/api_storage.h" @@ -63,7 +64,7 @@ mark() _Tt_api_stg_stack_elm_ptr e = new _Tt_api_stg_stack_elm; e->entry_type = _Tt_api_stg_stack_elm::STACK_MARK; - e->addr = (caddr_t) result; + e->addr = (caddr_t) (intptr_t) result; stack->push(e); return result; } @@ -83,7 +84,7 @@ release(int mark) if (c->entry_type == _Tt_api_stg_stack_elm::STACK_MARK) /* It is better to promote mark to caddr_t than to demote addr field for a 64 bit arch */ - if (c->addr == (caddr_t) mark) { + if (c->addr == (caddr_t) (intptr_t) mark) { found = 1; } } diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h index 5bc87dbf..8523d027 100644 --- a/cde/lib/tt/lib/tt_options.h +++ b/cde/lib/tt/lib/tt_options.h @@ -552,6 +552,7 @@ # define OPT_AUTOMOUNT_PATH_FIX # define OPT_BUG_RPCINTR # undef OPT_XTHREADS +# define OPT_CONST_CORRECT #elif defined(__OpenBSD__) diff --git a/cde/lib/tt/mini_isam/iscntl.c b/cde/lib/tt/mini_isam/iscntl.c index 07929538..e0ecc5a1 100644 --- a/cde/lib/tt/mini_isam/iscntl.c +++ b/cde/lib/tt/mini_isam/iscntl.c @@ -90,7 +90,7 @@ iscntl(isfd, func, va_alist) va_dcl #endif { - extern int (*_isfatal_error_set_func())(); + extern int ( *_isfatal_error_set_func)(); va_list pvar; int ret; @@ -106,7 +106,7 @@ iscntl(isfd, func, va_alist) break; case ISCNTL_FATAL: - ret = (int)_isfatal_error_set_func(va_arg(pvar, intfunc)); + ret = _isfatal_error_set_func(va_arg(pvar, intfunc)); break; case ISCNTL_FDLIMIT_SET: -- 2.25.1