external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

nval.h: remove dtksh additions & old compat redefs (re: e2d1b593)

Browse source 
CDE <https://cdesktopenv.sf.net/> developer Chase writes, re dtksh:
| Everything is now completely working, and we are almost ready to
| add ksh93 as a submodule, but I have one last commit to get rid
| of some warnings we are facing. nval.h has some of these
| "compatiblity redefines" that are causing issues whenever we
| include it (warnings about redefining values) [...].

src/cmd/ksh93/include/nval.h:
- Replace ancient compatibility redefines by an unconditional
  '#include <hash.h>'; ksh works fine with the "new" hash library.

Co-authored-by: Martijn Dekker <martijn@inlv.org>
This commit is contained in:
Chase 2020-08-16 14:37:59 -05:00 • committed by Martijn Dekker
parent d03e948bcd
commit c3388ffd85
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/cmd/ksh93/include/nval.h
View file

@ -32,17 +32,7 @@
#include <ast.h> #include <ast.h>
#include <cdt.h> #include <cdt.h>
#include <option.h> #include <option.h>
#ifdef BUILD_DTKSH
#include <hash.h> #include <hash.h>
#endif
/* for compatibility with old hash library */
#define Hashtab_t Dt_t
#define HASH_BUCKET 1
#define HASH_NOSCOPE 2
#define HASH_SCOPE 4
#define hashscope(x) dtvnext(x)
typedef struct Namval Namval_t; typedef struct Namval Namval_t;
typedef struct Namfun Namfun_t; typedef struct Namfun Namfun_t;
@ -115,9 +105,6 @@ struct Namdecl
/* This defines the attributes for an attributed name-value pair node */ /* This defines the attributes for an attributed name-value pair node */
struct Namval struct Namval
{ {
#if BUILD_DTKSH
HASH_HEADER; /* space for hash library */
#endif
Dtlink_t nvlink; /* space for cdt links */ Dtlink_t nvlink; /* space for cdt links */
char *nvname; /* pointer to name of the node */ char *nvname; /* pointer to name of the node */
#if _ast_sizeof_pointer == 8 #if _ast_sizeof_pointer == 8