debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into autotools-conversion

Browse Source
This commit is contained in:
Jon Trulson
2020-11-24 16:53:24 -07:00
parent 2b338e4241 dc45d133c9
commit 90e61dda5f
56 changed files with 307 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/include/Dt/Dt.h
View File

@@ -52,13 +52,13 @@ extern "C" {
#define DtVERSION 2
#define DtREVISION 3
#define DtUPDATE_LEVEL 1
#define DtUPDATE_LEVEL 2
#define DtVERSION_NUMBER (DtVERSION * 10000 + \
DtREVISION * 100 + \
DtUPDATE_LEVEL)
#define DtVERSION_STRING "CDE Version 2.3.1a"
#define DtVERSION_STRING "CDE Version 2.3.2a"
/*

6
cde/include/Dt/dbtype.h
View File

@@ -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 */