diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-06-22 08:32:55 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-06-22 08:32:55 -0400 |
| commit | 6e502e19455c6110dd4487d91b7b7d6d8121f9ba (patch) | |
| tree | 599037522f1ed983f575eaa4190308e11107e27f | |
| parent | 51f9aa6a1ed763cb133fff2efddfbf564a82a528 (diff) | |
| download | glibc-6e502e19455c6110dd4487d91b7b7d6d8121f9ba.zip glibc-6e502e19455c6110dd4487d91b7b7d6d8121f9ba.tar.gz glibc-6e502e19455c6110dd4487d91b7b7d6d8121f9ba.tar.bz2 | |
Clean up after kernel sigcontext header mess
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/sigcontext.h | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2011-06-21 Andreas Jaeger <aj@suse.de> + + * sysdeps/unix/sysv/linux/bits/sigcontext.h: Fix definition of + NULL after inclusion of kernel headers. + 2011-06-21 Ulrich Drepper <drepper@gmail.com> * 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 67dcf94..0f5b607 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 <asm/sigcontext.h> + +/* The Linux kernel headers redefine NULL wrongly, so cleanup afterwards. */ +# define __need_NULL +# include <stddef.h> #endif |