From 6e502e19455c6110dd4487d91b7b7d6d8121f9ba Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 22 Jun 2011 08:32:55 -0400 Subject: Clean up after kernel sigcontext header mess --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/bits/sigcontext.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5dc235e6c4..2901e2e67c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-06-21 Andreas Jaeger + + * sysdeps/unix/sysv/linux/bits/sigcontext.h: Fix definition of + NULL after inclusion of kernel headers. + 2011-06-21 Ulrich Drepper * nss/nss_db/db-XXX.c (nss_db_setENT): Only set entidx for successful diff --git a/sysdeps/unix/sysv/linux/bits/sigcontext.h b/sysdeps/unix/sysv/linux/bits/sigcontext.h index 67dcf94981..0f5b607cf9 100644 --- a/sysdeps/unix/sysv/linux/bits/sigcontext.h +++ b/sysdeps/unix/sysv/linux/bits/sigcontext.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,4 +26,8 @@ # define sigcontext_struct sigcontext # include + +/* The Linux kernel headers redefine NULL wrongly, so cleanup afterwards. */ +# define __need_NULL +# include #endif -- cgit v1.2.3