From d93fbc99166053b75c2eeb69b5cb603cfaf79ec0 Mon Sep 17 00:00:00 2001 From: jake Date: Tue, 23 May 2000 20:41:01 +0000 Subject: Change the way that the queue(3) structures are declared; don't assume that the type argument to *_HEAD and *_ENTRY is a struct. Suggested by: phk Reviewed by: phk Approved by: mdodd --- libexec/rtld-elf/rtld.c | 2 +- libexec/rtld-elf/rtld.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libexec/rtld-elf') diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 146b9b2..59f23b6 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1183,7 +1183,7 @@ objlist_remove(Objlist *list, Obj_Entry *obj) Objlist_Entry *elm; if ((elm = objlist_find(list, obj)) != NULL) { - STAILQ_REMOVE(list, elm, Struct_Objlist_Entry, link); + STAILQ_REMOVE(list, elm, struct Struct_Objlist_Entry, link); free(elm); } } diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 6d1ebbf..0830459 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -54,21 +54,21 @@ struct Struct_Obj_Entry; /* Lists of shared objects */ typedef struct Struct_Objlist_Entry { - STAILQ_ENTRY(Struct_Objlist_Entry) link; + STAILQ_ENTRY(struct Struct_Objlist_Entry) link; struct Struct_Obj_Entry *obj; } Objlist_Entry; -typedef STAILQ_HEAD(Struct_Objlist, Struct_Objlist_Entry) Objlist; +typedef STAILQ_HEAD(Struct_Objlist, struct Struct_Objlist_Entry) Objlist; /* Lists of init or fini functions */ typedef void (*InitFunc)(void); typedef struct Struct_Funclist_Entry { - STAILQ_ENTRY(Struct_Funclist_Entry) link; + STAILQ_ENTRY(struct Struct_Funclist_Entry) link; InitFunc func; } Funclist_Entry; -typedef STAILQ_HEAD(Struct_Funclist, Struct_Funclist_Entry) Funclist; +typedef STAILQ_HEAD(Struct_Funclist, struct Struct_Funclist_Entry) Funclist; /* Lists of shared object dependencies */ typedef struct Struct_Needed_Entry { -- cgit v1.1