From 0444e500bccf2e08abff06489f312f402867371d Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Tue, 24 Nov 2020 02:48:10 +0000 Subject: [PATCH] libDtSearch: Resolve GCC 10 errors about multiple definitions of global variables --- cde/lib/DtSearch/raima/dbtype.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cde/lib/DtSearch/raima/dbtype.h b/cde/lib/DtSearch/raima/dbtype.h index 5c7eea81e..dfd25215f 100644 --- a/cde/lib/DtSearch/raima/dbtype.h +++ b/cde/lib/DtSearch/raima/dbtype.h @@ -405,7 +405,11 @@ typedef struct {struct CNTRY_TBL_S *ptr; LOCK_DESC} CNTRY_TBL_P; struct sk { INT sk_fld; CHAR_P sk_val; -} __SK__; +}; + +/* PJH 20201124 unused struct variable declaration in header causing issues +struct sk __SK__; +*/ typedef struct { struct sk *ptr; LOCK_DESC } SK_P; /* node key search path stack entry: one per level per key field */