diff options
| author | Roland McGrath <roland@gnu.org> | 2005-02-15 00:16:39 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-02-15 00:16:39 +0000 |
| commit | 00a78f671f381e96497e789bd951a445daf91a90 (patch) | |
| tree | bf54cc87e7a82a065a923f6834c9ebbc6e9951ba | |
| parent | 804dc8a85e1f19e8e6743ca6a3303fc0d8f18942 (diff) | |
| download | glibc-00a78f671f381e96497e789bd951a445daf91a90.tar.gz glibc-00a78f671f381e96497e789bd951a445daf91a90.tar.xz glibc-00a78f671f381e96497e789bd951a445daf91a90.zip | |
[BZ #720]
2005-02-14 Roland McGrath <roland@redhat.com> [BZ #720] * sysdeps/unix/sysv/linux/sys/kd.h: Don't leave _LINUX_TYPES_H defined if it wasn't originally.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/kd.h | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 0dba6de1ea..2cb7437bf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-14 Roland McGrath <roland@redhat.com> + + [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 <gotom@debian.or.jp> * 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 e0d2e869cf..d459c079ed 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 <linux/types.h> 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 <linux/kd.h> +#ifdef __undef_LINUX_TYPES_H +# undef _LINUX_TYPES_H +# undef __undef_LINUX_TYPES_H +#endif + #endif /* sys/kd.h */ |