From bb9ccdb5e7ba69098ec6bad9bca015f491e675c1 Mon Sep 17 00:00:00 2001 From: Isabel Suhr Date: Mon, 27 Feb 2023 14:56:54 -0700 Subject: [PATCH 1/2] Replace deprecated caddr_t with void * --- API/Sources/bufr_desc.c | 2 +- API/Sources/bufr_linklist.c | 2 +- API/Sources/bufr_value.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/API/Sources/bufr_desc.c b/API/Sources/bufr_desc.c index 05030e5..2669d7f 100644 --- a/API/Sources/bufr_desc.c +++ b/API/Sources/bufr_desc.c @@ -41,7 +41,7 @@ This file is part of libECBUFR. #include "private/gcmemory.h" #include "config.h" -static caddr_t BufrDescriptor_gcmemory=NULL; +static void * BufrDescriptor_gcmemory=NULL; static int bufr_check_class31_set( BufrDescriptor *cb ); diff --git a/API/Sources/bufr_linklist.c b/API/Sources/bufr_linklist.c index 8e41dd4..4e21358 100644 --- a/API/Sources/bufr_linklist.c +++ b/API/Sources/bufr_linklist.c @@ -25,7 +25,7 @@ This file is part of libECBUFR. #include "private/gcmemory.h" #include "config.h" -static caddr_t ListNode_gcmemory=NULL; +static void * ListNode_gcmemory=NULL; /************************************************************************** diff --git a/API/Sources/bufr_value.c b/API/Sources/bufr_value.c index d8045d2..7a898b7 100644 --- a/API/Sources/bufr_value.c +++ b/API/Sources/bufr_value.c @@ -40,13 +40,13 @@ This file is part of libECBUFR. #include "private/gcmemory.h" #include "config.h" -static caddr_t ValueINT8_gcmemory=NULL; -static caddr_t ValueINT16_gcmemory=NULL; -static caddr_t ValueINT32_gcmemory=NULL; -static caddr_t ValueINT64_gcmemory=NULL; -static caddr_t ValueFLT32_gcmemory=NULL; -static caddr_t ValueFLT64_gcmemory=NULL; -static caddr_t ValueSTRING_gcmemory=NULL; +static void * ValueINT8_gcmemory=NULL; +static void * ValueINT16_gcmemory=NULL; +static void * ValueINT32_gcmemory=NULL; +static void * ValueINT64_gcmemory=NULL; +static void * ValueFLT32_gcmemory=NULL; +static void * ValueFLT64_gcmemory=NULL; +static void * ValueSTRING_gcmemory=NULL; /** * @english From c7b577d8795461063487ac19a1dd869f115b316d Mon Sep 17 00:00:00 2001 From: Isabel Suhr Date: Mon, 27 Feb 2023 14:58:46 -0700 Subject: [PATCH 2/2] Remove include of malloc.h, which no longer exists --- API/Sources/gcmemory.c | 1 - 1 file changed, 1 deletion(-) diff --git a/API/Sources/gcmemory.c b/API/Sources/gcmemory.c index 2a09c4d..e27c607 100644 --- a/API/Sources/gcmemory.c +++ b/API/Sources/gcmemory.c @@ -26,7 +26,6 @@ This file is part of libECBUFR. #include -#include #include #include #include "private/gcmemory.h"