From 00a78f671f381e96497e789bd951a445daf91a90 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 15 Feb 2005 00:16:39 +0000 Subject: [PATCH] [BZ #720] 2005-02-14 Roland McGrath [BZ #720] * sysdeps/unix/sysv/linux/sys/kd.h: Don't leave _LINUX_TYPES_H defined if it wasn't originally. --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/sys/kd.h | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0dba6de..2cb7437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-14 Roland McGrath + + [BZ #720] + * sysdeps/unix/sysv/linux/sys/kd.h: Don't leave _LINUX_TYPES_H defined + if it wasn't originally. + 2005-02-14 GOTO Masanori * sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove the duplicated diff --git a/sysdeps/unix/sysv/linux/sys/kd.h b/sysdeps/unix/sysv/linux/sys/kd.h index e0d2e86..d459c07 100644 --- a/sysdeps/unix/sysv/linux/sys/kd.h +++ b/sysdeps/unix/sysv/linux/sys/kd.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2005 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 @@ -21,9 +21,15 @@ /* Make sure the header is not loaded. */ #ifndef _LINUX_TYPES_H -# define _LINUX_TYPES_H 1 +# define _LINUX_TYPES_H 1 +# define __undef_LINUX_TYPES_H #endif #include +#ifdef __undef_LINUX_TYPES_H +# undef _LINUX_TYPES_H +# undef __undef_LINUX_TYPES_H +#endif + #endif /* sys/kd.h */ -- 2.7.4