From: Yann E. MORIN Date: Mon, 29 Apr 2013 17:50:32 +0000 (+0200) Subject: kconfig: fix lists definition for C++ X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=21ca352b71ca252e1933b1538fe89da8a04395c3;p=deliverable%2Flinux.git kconfig: fix lists definition for C++ The C++ compiler is more strict in that it refuses to assign a void* to a struct list_head*. Fix that by explicitly casting the poisonning constants. (Tested with all 5 frontends, now.) Reported-by: Randy Dunlap Signed-off-by: "Yann E. MORIN" Cc: Randy Dunlap Cc: Benjamin Poirier --- diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h index ea1d58119d20..685d80e1bb0e 100644 --- a/scripts/kconfig/list.h +++ b/scripts/kconfig/list.h @@ -125,7 +125,7 @@ static inline void __list_del(struct list_head *prev, struct list_head *next) static inline void list_del(struct list_head *entry) { __list_del(entry->prev, entry->next); - entry->next = LIST_POISON1; - entry->prev = LIST_POISON2; + entry->next = (struct list_head*)LIST_POISON1; + entry->prev = (struct list_head*)LIST_POISON2; } #endif