Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename enum_t to avoid rpc/types.h lossage.

This commit is contained in:
christos 2013-02-17 01:26:19 +00:00
parent 33b31c0d79
commit 47281a37ea
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/xlint/lint1/decl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: decl.c,v 1.54 2012/03/27 19:24:03 christos Exp $ */
/* $NetBSD: decl.c,v 1.55 2013/02/17 01:26:19 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: decl.c,v 1.54 2012/03/27 19:24:03 christos Exp $");
__RCSID("$NetBSD: decl.c,v 1.55 2013/02/17 01:26:19 christos Exp $");
#endif
#include <sys/param.h>
@ -1662,7 +1662,7 @@ mktag(sym_t *tag, tspec_t kind, int decl, int semi)
tp->t_str->stag = tag;
} else {
tp->t_isenum = 1;
tp->t_enum = getblk(sizeof (enum_t));
tp->t_enum = getblk(sizeof(*tp->t_enum));
tp->t_enum->etag = tag;
}
/* ist unvollstaendiger Typ */

8
usr.bin/xlint/lint1/lint1.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lint1.h,v 1.25 2011/06/24 01:10:31 christos Exp $ */
/* $NetBSD: lint1.h,v 1.26 2013/02/17 01:26:19 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@ -137,7 +137,7 @@ typedef struct {
struct sym *elem; /* list of enumerators */
struct sym *etag; /* symbol table entry of tag */
struct sym *etdef; /* symbol table entry of first typename */
} enum_t;
} tenum_t;
/*
* Types are represented by concatenation of structures of type type_t
@ -157,7 +157,7 @@ struct type {
union {
int _t_dim; /* dimension */
str_t *_t_str; /* struct/union tag */
enum_t *_t_enum; /* enum tag */
tenum_t *_t_enum; /* enum tag */
struct sym *_t_args; /* arguments (if t_proto) */
} t_u;
struct {
@ -243,7 +243,7 @@ typedef struct sym {
val_t s_value; /* value (if enumcon) */
union {
str_t *_s_st; /* tag, if it is a struct/union member */
enum_t *_s_et; /* tag, if it is a enumerator */
tenum_t *_s_et; /* tag, if it is a enumerator */
tspec_t _s_tsp; /* type (only for keywords) */
tqual_t _s_tqu; /* qualifier (only for keywords) */
struct sym *_s_args; /* arguments in old style function